Changeset 171 in ProjectBuilder for devel/pb/lib
- Timestamp:
- Oct 4, 2007, 11:44:59 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Distribution.pm
r156 r171 19 19 ($ddir,$dver) = pb_get_distro() if ((not defined $ddir) || (not defined $dver)); 20 20 21 # There sho ld be unicity of names between ddir dfam and dtype21 # There should be unicity of names between ddir dfam and dtype 22 22 # In case of duplicate, bad things can happen 23 23 if (($ddir =~ /debian/) || … … 60 60 } 61 61 } elsif (($ddir =~ /mandrake/) || 62 ($ddir =~ /mandrakelinux/) || 62 63 ($ddir =~ /mandriva/)) { 63 64 $dfam="md"; 64 65 $dtype="rpm"; 66 if ($ddir =~ /mandrakelinux/) { 67 $ddir = "mandrake"; 68 } 65 69 if ($ddir =~ /mandrake/) { 66 70 my $dver1 = $dver; … … 100 104 'slackware' => 'slackware-version', # >= 10.2 101 105 'mandriva' => 'mandriva-release', # >=2006.0 106 'mandrakelinux' => 'mandrakelinux-release',# = 10.2 102 107 'fedora' => 'fedora-release', # >= 4 103 108 'vmware' => 'vmware-release', # >= 3 … … 133 138 # List of files that ambiguously indicates what distro we have 134 139 my %ambiguous_rel_files = ( 135 'mandrake' => 'mandrake-release', # >= 10.1140 'mandrake' => 'mandrake-release', # <= 10.1 136 141 'suse' => 'SuSE-release', # >= 10.0 137 142 'redhat' => 'redhat-release', # >= 7.3 … … 142 147 # If ambiguity, which other distributions should be checked 143 148 my %distro_similar = ( 144 'mandrake' => ['mandrake' ],149 'mandrake' => ['mandrake', 'mandrakelinux'], 145 150 'suse' => ['suse', 'sles'], 146 151 'redhat' => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'], … … 154 159 'slackware' => 'S[^ ]* (.+)$', 155 160 # There should be no ambiguity between potential ambiguous distro 161 'mandrakelinux' => 'Mandrakelinux release (.+) \(', 156 162 'mandrake' => 'Mandr[^ ]* release (.+) \(', 157 163 'mandriva' => 'Mandr[^ ]* [^ ]* release (.+) \(', … … 177 183 my ($d,$r); 178 184 while (($d,$r) = each %single_rel_files) { 179 if (-f "$base/$r" && ! -l "$base/$r") {185 if (-f "$base/$r" && ! -l "$base/$r") { 180 186 my $tmp=pb_get_content("$base/$r"); 181 187 # Found the only possibility.
Note:
See TracChangeset
for help on using the changeset viewer.