Changeset 1155

Timestamp:

01/12/11 11:45:29 (2 years ago)

Author:

bruno

Message:

• Fix a bug in dir delivery due to the recent change using the arch subdir to avoid conflicts
• Fix bug for ol mandrake release which were not built correctly due to configuration file issues (mix of mandrake and mandrakelinux)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (4 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -33 +33 @@
 osrelfile mandriva = /etc/mandriva-release
 
-# Mandrake = 10.2
-osrelfile mandrakelinux = /etc/mandrakelinux-release
+# Mandrake = 10.1,10.2
+osrelfile mandrake = /etc/mandrakelinux-release
 
 # Fedora >= 4
@@ -101 +101 @@
 
 #
-# Here is the association between the key and all the OS usig the same file
+# Here is the association between the key and all the OS using the same file
 # The key mentioned here should be the same as the previous ones
 #
-osambiguous mandrake = mandrake,mandrakelinux
+osambiguous mandrake = mandrake,mandriva
 osambiguous debian = debian,ubuntu
 osambiguous suse = suse,sles,opensuse
-osambiguous redhat = redhat,rhel,centos,mandrake,vmware
+osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware
 osambiguous lsb = ubuntu,lsb
 
@@ -117 +117 @@
 osrelexpr slackware = S[^ ]* (.+)$
 osrelexpr mandriva = Mandr[^ ]* [^ ]* release (.+) \(
-osrelexpr mandrake = Mandr[^ ]* release (.+) \(
-osrelexpr mandrakelinux = Mandrakelinux release (.+) \(
+osrelexpr mandrake = Mandrakelinux release (.+) \(
 osrelexpr fedora = Fedora .*release (\d+) \(
 osrelexpr vmware = VMware ESX Server (\d+) \(
@@ -163 +162 @@
 osfamily centos = rh
 osfamily mandrake = md
-osfamily mandrakelinux = md
 osfamily mandriva = md
 osfamily lsb = rh

devel/pb/bin/pb

@@ -1778 +1778 @@
             my $j = basename($p);
             pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
-            $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
+            $made="$made $odir/$over/$oarch/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
         print KEEP "$made\n";