Changeset 1111 in ProjectBuilder


Ignore:
Timestamp:
Nov 18, 2010, 2:06:01 AM (14 years ago)
Author:
Bruno Cornec
Message:
  • Rename previous option osupd into the more correct osins, and add a real osupd param to support distribution update commands
  • Adds 2 new commands to update distributions in VM|VE with updatevm|ve (Fix #70)
Location:
devel
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • devel/pb-modules/bin/pbdistrocheck

    r1071 r1111  
    121121@param = split(/-/,$dist) if (defined $dist);
    122122
    123 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init(@param);
     123my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init(@param);
    124124my $sep = "\n";
    125125if (defined $opts{'l'}) {
    … …  
    144144        $pbsuf = "Suffix:\t$pbsuf";
    145145        $pbupd = "Update:\t$pbupd";
     146        $pbins = "Install:\t$pbupd";
    146147        $arch = "Arch:\t$arch";
    147148        print "Project-Builder tuple:\n";
    148149    }
    149     print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd))."\n";
     150    print join($sep,($dos, $ddir, $dver, $arch, $dtype, $dfam, $pbsuf, $pbupd, $pbins))."\n";
    150151}

  • devel/pb-modules/etc/pb.conf

    r1109 r1111  
    194194# key depends on granularity, value is install command
    195195
     196# Command to update the distribution to latest state
     197osupd du = sudo apt-get update
     198osupd gen = sudo emerge
     199osupd rpm = sudo yum clean all; sudo yum -y update
     200osupd md = sudo urpmi.update -a ; sudo urpmi --autoa--auto-select
     201osupd opensuse = sudo zypper -n update
     202osupd sol = /bin/true
     203osupd lsb = /bin/true
     204
    196205# Chaining the commands allow to only test for what is able to be installed,
    197206# not the update of the repo which may well be unaccessible if too old
    198 osupd du = sudo apt-get update ; sudo apt-get -y install
    199 osupd gen = sudo emerge
    200 osupd rpm = sudo yum clean all; sudo yum -y update ; sudo yum -y install
    201 osupd rhel-2.1 = sudo up2date -y
    202 osupd rhel-3 = sudo up2date -y
    203 osupd rhel-4 = sudo up2date -y
    204 osupd md = sudo urpmi.update -a ; sudo urpmi --auto
    205 osupd novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i
    206 osupd opensuse-10.2 = sudo yes | zypper install
    207 osupd opensuse = sudo zypper -n install
    208 osupd sol = sudo pkgadd -d
    209 osupd lsb = /bin/true
     207osins du = sudo apt-get update ; sudo apt-get -y install
     208osins gen = sudo emerge
     209osins rpm = sudo yum clean all; sudo yum -y update ; sudo yum -y install
     210osins rhel-2.1 = sudo up2date -y
     211osins rhel-3 = sudo up2date -y
     212osins rhel-4 = sudo up2date -y
     213osins md = sudo urpmi.update -a ; sudo urpmi --auto
     214osins novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i
     215osins opensuse-10.2 = sudo yes | zypper install
     216osins opensuse = sudo zypper -n install
     217osins sol = sudo pkgadd -d
     218osins lsb = /bin/true
    210219
    211220# From the most generic to the most specialized, in term of granularity,

  • devel/pb-modules/etc/pb.conf.pod

    r1109 r1111  
    102102 Conffile: pb
    103103 Example: osfamily debian = du
     104
     105=item B<osins>
     106
     107 Nature: Optional
     108 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
     109 Value: OS command to lauch in order to automatically install packages on it.
     110 Conffile: pb
     111 Example: osins fedora = sudo yum -y install
    104112
    105113=item B<osmindep>
    … …  
    196204 Nature: Optional
    197205 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    198  Value: OS command to lauch in order to automatically install packages on it.
    199  Conffile: pb
    200  Example: ostype rh = rpm, ostype md = rpm, ostype novell = rpm
     206 Value: OS command to lauch in order to automatically update th VM|VE
     207 Conffile: pb
     208 Example: osupd fedora = sudo yum -y update
    201209
    202210=item B<pbconfurl>

  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r1102 r1111  
    4242  # Return information on the running distro
    4343  #
    44   my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init();
    45   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
     44  my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $pbins, $arch) = pb_distro_init();
     45  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
    4646  #
    4747  # Return information on the requested distro
    4848  #
    49   my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
    50   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
     49  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init("ubuntu","7.10","x86_64");
     50  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
    5151  #
    5252  # Return information on the running distro
    5353  #
    5454  my ($ddir,$dver) = pb_distro_get();
    55   my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);
    56   print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n";
     55  my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init($ddir,$dver);
     56  print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch)."\n";
    5757
    5858=head1 USAGE
    … …  
    7474=item B<pb_distro_init>
    7575
    76 This function returns a list of 7 parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line and architecture of the underlying Linux distribution. The value of the 7 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
     76This function returns a list of 8 parameters indicating the distribution name, version, family, type of build system, suffix of packages, update command line, installation command line and architecture of the underlying Linux distribution. The value of the 8 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
    7777
    7878As an example, Ubuntu and Debian are in the same "du" family. As well as RedHat, RHEL, CentOS, fedora are on the same "rh" family.
    … …  
    9898my $dsuf = "unknown";
    9999my $dupd = "unknown";
     100my $dins = "unknown";
    100101my $darch = shift || undef;
    101102my $dnover = "false";
    … …  
    113114$darch=pb_get_arch() if (not defined $darch);
    114115
    115 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os");
     116my ($osfamily,$ostype,$osupd,$osins,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","osins","ossuffix","osnover","osremovedotinver","os");
    116117
    117118# Dig into the tuple to find the best answer
    … …  
    120121$dos = pb_distro_get_param($ddir,$dver,$darch,$os,$dfam,$dtype);
    121122$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype,$dos);
     123$dins = pb_distro_get_param($ddir,$dver,$darch,$osins,$dfam,$dtype,$dos);
    122124$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype,$dos);
    123125$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype,$dos);
    … …  
    141143#   $opt="--exclude=*.i?86";
    142144#   }
    143 pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n");
    144 
    145 return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch);
     145pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $dins, $darch\n");
     146
     147return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $dins, $darch);
    146148}
    147149

  • devel/pb/bin/pb

    r1109 r1111  
    257257
    258258Snapshot a virtual environment for pb usage
     259
     260=item B<updatevm>
     261
     262Update the distribution in the virtual machine
     263
     264=item B<updateve>
     265
     266Update the distribution in the virtual environment
    259267
    260268=item B<test2pkg>
    … …  
    530538} elsif ($action =~ /^setupvm$/) {
    531539    pb_setup2v("vm");
     540} elsif ($action =~ /^updateve$/) {
     541    pb_update2v("ve");
     542} elsif ($action =~ /^updatevm$/) {
     543    pb_update2v("vm");
    532544} elsif ($action =~ /^snapve$/) {
    533545    pb_snap2v("ve");
    … …  
    670682        my %build;
    671683        # We want to at least build for the underlying distro
    672         my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
     684        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
    673685        my $tmpl = "$ddir-$dver-$arch,";
    674686        my %patches;
    … …  
    929941sub pb_test2pkg {
    930942    # Get the running distro to test on
    931     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
    932     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
     943    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
     944    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch))."\n");
    933945
    934946    # Get list of packages to test
    … …  
    941953    foreach my $pbpkg (@pkgs) {
    942954        # We need to install the package to test, and deps brought with it
    943         pb_distro_installdeps(undef,$dtype,$pbupd,$pbpkg);
     955        pb_distro_installdeps(undef,$dtype,$pbins,$pbpkg);
    944956        pb_system("$ENV{'PBDESTDIR'}/pbtest","Launching test for $pbpkg","verbose");
    945957    }
    … …  
    949961
    950962    # Get the running distro to build on
    951     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init();
    952     pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch))."\n");
     963    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $arch) = pb_distro_init();
     964    pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $arch))."\n");
    953965
    954966    # Get list of packages to build
    … …  
    10021014            foreach my $f (@specfile) {
    10031015                if ($f =~ /\.spec$/) {
    1004                     pb_distro_installdeps($f,$dtype,$pbupd);
     1016                    pb_distro_installdeps($f,$dtype,$pbins);
    10051017                    pb_system("rpmbuild $specialdef --define \"packager $ENV{'PBPACKAGER'}\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
    10061018                    last;
    … …  
    10281040
    10291041            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
    1030             pb_distro_installdeps("debian/control",$dtype,$pbupd);
     1042            pb_distro_installdeps("debian/control",$dtype,$pbins);
    10311043            pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
    10321044            # Get the name of the generated packages
    … …  
    10811093            foreach my $f (@ebuildfile) {
    10821094                if ($f =~ /\.ebuild$/) {
    1083                     pb_distro_installdeps($f,$dtype,$pbupd);
     1095                    pb_distro_installdeps($f,$dtype,$pbins);
    10841096                    move($f,"$tmpd/$pbpkg-$pbver.ebuild");
    10851097                    pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
    … …  
    11011113            symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
    11021114            if (-x "install/pbslack") {
    1103                 pb_distro_installdeps("./install/pbslack",$dtype,$pbupd);
     1115                pb_distro_installdeps("./install/pbslack",$dtype,$pbins);
    11041116                pb_system("./install/pbslack","Building software");
    11051117                pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg","verbose");
    … …  
    12571269    my $src = "";
    12581270    my ($odir,$over,$oarch) = (undef, undef, undef);
    1259     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch);
     1271    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch);
    12601272
    12611273    if ($cmt ne "Announce") {
    … …  
    12681280            ($odir,$over,$oarch) = split(/-/,$v);
    12691281        }
    1270         ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init($odir,$over,$oarch);
    1271         pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n");
     1282        ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch) = pb_distro_init($odir,$over,$oarch);
     1283        pb_log(2,"DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $darch))."\n");
    12721284
    12731285        # Get list of packages to build
    … …  
    23152327    my ($name,$ver,$darch) = split(/-/,$v);
    23162328    chomp($darch);
    2317     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     2329    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
    23182330   
    23192331    # Name of the account to deal with for VM/VE
    … …  
    25142526# And we now need the conf file required for this to work created above
    25152527
    2516 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $darch) = pb_distro_init();
    2517 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $darch))."\n";
     2528my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins, $darch) = pb_distro_init();
     2529print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $pbins, $darch))."\n";
    25182530
    25192531# Adapt sudoers
    … …  
    25752587   
    25762588my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
    2577 pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
     2589pb_distro_installdeps(undef,$dtype,$pbins,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
    25782590
    25792591EOF
    … …  
    26022614my $pkgforpb = pb_distro_get_param($ddir,$dver,$darch,$pbpkg,$dfam,$dtype,$depdos);
    26032615pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
    2604 pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgforpb))));
     2616pb_distro_installdeps(undef,$dtype,$pbins,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgforpb))));
    26052617EOF
    26062618    } else {
    … …  
    26532665    $pbaccount = "root";
    26542666
    2655     # Force shutdown of VM exept if it was already launched
     2667    # Force shutdown of VM except if it was already launched
    26562668    my $pbforce = 0;
    26572669    if ((! $vmexist) && ($vtype eq "vm")) {
    … …  
    26882700            pb_system("sudo rm -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Removing previous snapshot $ddir-$dver-$darch.tar.gz");
    26892701    }
    2690 
    2691     # Name of the account to deal with for VM/VE
    2692     # Do not use the one passed potentially with -a
    2693     my ($vmexist,$vmpid);
    26942702
    26952703    # Prepare the script to be executed on the VM/VE
    … …  
    27072715    # Force snapshot of VM/VE
    27082716    pb_script2v($pbscript,$vtype,1,$v,1);
     2717}
     2718return;
     2719}
     2720
     2721# Function to update a VMs or VEs with the latest distribution content
     2722sub pb_update2v {
     2723
     2724my $vtype = shift;
     2725
     2726my ($vm,$all) = pb_get2v($vtype);
     2727
     2728# Script generated
     2729my $pbscript = "$ENV{'PBDESTDIR'}/updatev";
     2730
     2731my ($pbac) = pb_conf_get($vtype."login");
     2732
     2733foreach my $v (@$vm) {
     2734    # Get distro context
     2735    my ($name,$ver,$darch) = split(/-/,$v);
     2736    chomp($darch);
     2737    my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
     2738
     2739    # Prepare the script to be executed on the VM/VE
     2740    # in $ENV{'PBDESTDIR'}/updatev
     2741    open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
     2742   
     2743    print SCRIPT << 'EOF';
     2744    #!/bin/bash
     2745    sleep 2
     2746EOF
     2747    # VE needs a good /proc
     2748    if ($vtype eq "ve") {
     2749        print SCRIPT "sudo mount -t proc /proc /proc\n";
     2750    }
     2751    print SCRIPT "$pbupd\n";
     2752    if ($vtype eq "ve") {
     2753        print SCRIPT "sudo umount /proc\n";
     2754    }
     2755    close(SCRIPT);
     2756    chmod 0755,"$pbscript";
     2757
     2758    # Force shutdown of VM except
     2759    pb_script2v($pbscript,$vtype,1,$v);
    27092760}
    27102761return;

  • devel/rpmbootstrap/bin/rpmbootstrap

    r1082 r1111  
    216216my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
    217217chomp($darch);
    218 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
     218my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
    219219
    220220#
    … …  
    282282my $repo = $mirror;
    283283my $found = 0;
    284 if ($pbupd =~ /yum/) {
     284if ($pbins =~ /yum/) {
    285285    my $response1;
    286286    while ($found == 0) {
    … …  
    334334my $osupdname = "";
    335335
    336 if ($pbupd =~ /yum/) {
     336if ($pbins =~ /yum/) {
    337337    $oscachedir = "$vepath/var/cache/yum/core/packages/";
    338338    $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
    … …  
    344344        $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
    345345    }
    346 } elsif ($pbupd =~ /zypper/) {
     346} elsif ($pbins =~ /zypper/) {
    347347    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
    348348    $osupdname = "Zypper";
    349 } elsif ($pbupd =~ /urpmi/) {
     349} elsif ($pbins =~ /urpmi/) {
    350350    $oscachedir = "$vepath/var/cache/urpmi/rpms";
    351351    $osupdname = "URPMI";
    … …  
    418418
    419419# yum needs that distro-release package be installed, so force it
    420 if ($pbupd =~ /yum/) {
     420if ($pbins =~ /yum/) {
    421421    foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
    422422        copy("$cachedir/$p1","$vepath/tmp");
    … …  
    461461
    462462pb_log(1,"Adapting $osupdname repository entries\n");
    463 if ($pbupd =~ /yum/) {
     463if ($pbins =~ /yum/) {
    464464    #
    465465    # Force the architecture for yum
    … …  
    478478    }
    479479    $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
    480 } elsif ($pbupd =~ /zypper/) {
     480} elsif ($pbins =~ /zypper/) {
    481481    pb_mkdir_p("$vepath/etc/zypp/repos.d");
    482482    open(REPO,"> $vepath/etc/zypp/repos.d/$ddir-$dver") || die "Unable to create repo file";
    … …  
    497497        pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $ddir-$dver\"","Bootstrapping Zypper");
    498498    }
    499 } elsif ($pbupd =~ /urpmi/) {
     499} elsif ($pbins =~ /urpmi/) {
    500500    # Setup the repo
    501501    my $baseurl = dirname(dirname(dirname($mirror)));
    … …  
    508508# No need for sudo here
    509509#
    510 $pbupd =~ s/sudo//g;
    511 pb_system("chroot $vepath /bin/bash -c \"$pbupd $minipkglist \"","Bootstrapping OS by running $pbupd $minipkglist");
     510$pbins =~ s/sudo//g;
     511pb_system("chroot $vepath /bin/bash -c \"$pbins $minipkglist \"","Bootstrapping OS by running $pbins $minipkglist");
    512512
    513513#
    … …  
    520520if (defined $opts{'a'}) {
    521521    $opts{'a'} =~ s/,/ /g;
    522     pb_system("chroot $vepath /bin/bash -c \"$pbupd $opts{'a'} \"","Adding packages to OS by running $pbupd $opts{'a'}");
     522    pb_system("chroot $vepath /bin/bash -c \"$pbins $opts{'a'} \"","Adding packages to OS by running $pbins $opts{'a'}");
    523523}
    524524
    … …  
    527527#
    528528pb_log(1,"Cleaning up\n");
    529 if ($pbupd =~ /yum/) {
     529if ($pbins =~ /yum/) {
    530530    pb_system("chroot $vepath /usr/bin/yum clean all","Cleaning yum");
    531531}
Note: See TracChangeset for help on using the changeset viewer.