Changeset 171 in ProjectBuilder for devel/pb/lib

Timestamp:

Oct 4, 2007, 11:44:59 PM (17 years ago)

Author:

Bruno Cornec

Message:

Mandrakelinux 2006.0 has a mandrakeliux-release file which is a link. So creation of a new entry for a mandrakelinux ddir which is then modified in mandrake after detection

File:

• devel/pb/lib/ProjectBuilder/Distribution.pm (modified) (7 diffs)

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -19 +19 @@
 ($ddir,$dver) = pb_get_distro() if ((not defined $ddir) || (not defined $dver));
 
-# There shold be unicity of names between ddir dfam and dtype
+# There should be unicity of names between ddir dfam and dtype
 # In case of duplicate, bad things can happen
 if (($ddir =~ /debian/) ||
@@ -60 +60 @@
     }
 } elsif (($ddir =~ /mandrake/) ||
+        ($ddir =~ /mandrakelinux/) ||
         ($ddir =~ /mandriva/)) {
     $dfam="md";
     $dtype="rpm";
+    if ($ddir =~ /mandrakelinux/) {
+        $ddir = "mandrake";
+    }
     if ($ddir =~ /mandrake/) {
         my $dver1 = $dver;
@@ -100 +104 @@
     'slackware'         =>  'slackware-version',    # >= 10.2
     'mandriva'          =>  'mandriva-release',     # >=2006.0
+    'mandrakelinux'     =>  'mandrakelinux-release',# = 10.2
     'fedora'            =>  'fedora-release',       # >= 4
     'vmware'            =>  'vmware-release',       # >= 3
@@ -133 +138 @@
 # List of files that ambiguously indicates what distro we have
 my %ambiguous_rel_files = (
-    'mandrake'          =>  'mandrake-release',     # >= 10.1
+    'mandrake'          =>  'mandrake-release',     # <= 10.1
     'suse'              =>  'SuSE-release',         # >= 10.0
     'redhat'            =>  'redhat-release',       # >= 7.3
@@ -142 +147 @@
 # If ambiguity, which other distributions should be checked
 my %distro_similar = (
-    'mandrake'          => ['mandrake'],
+    'mandrake'          => ['mandrake', 'mandrakelinux'],
     'suse'              => ['suse', 'sles'],
     'redhat'            => ['redhat', 'rhel', 'centos', 'mandrake', 'vmware'],
@@ -154 +159 @@
     'slackware'             => 'S[^ ]* (.+)$',
 # There should be no ambiguity between potential ambiguous distro
+    'mandrakelinux'         => 'Mandrakelinux release (.+) \(',
     'mandrake'              => 'Mandr[^ ]* release (.+) \(',
     'mandriva'              => 'Mandr[^ ]* [^ ]* release (.+) \(',
@@ -177 +183 @@
 my ($d,$r);
 while (($d,$r) = each %single_rel_files) {
-    if (-f "$base/$r" && !-l "$base/$r") {
+    if (-f "$base/$r" && ! -l "$base/$r") {
         my $tmp=pb_get_content("$base/$r");
         # Found the only possibility.