Changeset 1155


Ignore:
Timestamp:
Jan 12, 2011, 11:45:29 AM (9 years ago)
Author:
Bruno Cornec
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:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1132 r1155  
    3333osrelfile mandriva = /etc/mandriva-release
    3434
    35 # Mandrake = 10.2
    36 osrelfile mandrakelinux = /etc/mandrakelinux-release
     35# Mandrake = 10.1,10.2
     36osrelfile mandrake = /etc/mandrakelinux-release
    3737
    3838# Fedora >= 4
     
    101101
    102102#
    103 # Here is the association between the key and all the OS usig the same file
     103# Here is the association between the key and all the OS using the same file
    104104# The key mentioned here should be the same as the previous ones
    105105#
    106 osambiguous mandrake = mandrake,mandrakelinux
     106osambiguous mandrake = mandrake,mandriva
    107107osambiguous debian = debian,ubuntu
    108108osambiguous suse = suse,sles,opensuse
    109 osambiguous redhat = redhat,rhel,centos,mandrake,vmware
     109osambiguous redhat = redhat,rhel,centos,mandrake,mandriva,vmware
    110110osambiguous lsb = ubuntu,lsb
    111111
     
    117117osrelexpr slackware = S[^ ]* (.+)$
    118118osrelexpr mandriva = Mandr[^ ]* [^ ]* release (.+) \(
    119 osrelexpr mandrake = Mandr[^ ]* release (.+) \(
    120 osrelexpr mandrakelinux = Mandrakelinux release (.+) \(
     119osrelexpr mandrake = Mandrakelinux release (.+) \(
    121120osrelexpr fedora = Fedora .*release (\d+) \(
    122121osrelexpr vmware = VMware ESX Server (\d+) \(
     
    163162osfamily centos = rh
    164163osfamily mandrake = md
    165 osfamily mandrakelinux = md
    166164osfamily mandriva = md
    167165osfamily lsb = rh
  • devel/pb/bin/pb

    r1154 r1155  
    17781778            my $j = basename($p);
    17791779            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");
    1780             $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
     1780            $made="$made $odir/$over/$oarch/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
    17811781        }
    17821782        print KEEP "$made\n";
Note: See TracChangeset for help on using the changeset viewer.