Changeset 288


Ignore:
Timestamp:
Dec 1, 2007, 6:30:51 PM (12 years ago)
Author:
bruno
Message:
  • Document -i option
  • send packages before halting the VM (useful when you wait for them :-)
Location:
devel/pb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r285 r288  
    348348        }
    349349        close(PKG);
     350
     351        # Final cleanup
     352        pb_rm_rf($dest) if (-d $dest);
    350353    }
    351354}
     
    596599        close(KEEP);
    597600        pb_system("ssh -q -p $nport $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
     601        pb_send2ssh("Packages","$odir"."_"."$over");
    598602        if (! $vmexist) {
    599603            pb_system("ssh -q -p $nport $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
    600604        }
    601         pb_send2ssh("Packages","$odir"."_"."$over");
    602605        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
    603606    }
     
    870873    print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
    871874    print "\n";
    872     print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
     875    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script -a account -P port] -m \"mach-1[,...]\"][-i iso] <action> [<pkg1>...]\n";
    873876    print "\n";
    874877    print "-h : This help file\n";
     
    884887    print "             to execute on the related VMs.\n";
    885888    print "\n";
     889    print "-i iso     : Name of the ISO image of the distribution you want\n";
     890    print "             to install on the related VMs.\n";
     891    print "\n";
    886892    print "-a account : Name of the account to use\n";
    887893    print "             to connect on the related VMs.\n";
  • devel/pb/lib/ProjectBuilder/Base.pm

    r287 r288  
    277277
    278278# PBGRP is replaced by the RPM group of apps
     279# Cf: http://fedoraproject.org/wiki/RPMGroups
    279280#filter PBGRP = Applications/Archiving
    280281
     
    581582%build
    582583%configure
    583 make %{?_smp_mflags} VERSION=%{version}
     584make %{?_smp_mflags}
    584585
    585586%install
     
    910911    }
    911912} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
    912     # Nothing to do
     913    if (! -f "$dest/ChangeLog") {
     914        pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     915    }
    913916} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
    914917    my $tmp=basename($pkgdir);
     
    916919    if (! -f "$dest/ChangeLog") {
    917920        if (-x "/usr/bin/cvs2cl") {
    918             pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
     921            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS");
    919922        } else {
    920923            # To be written from pbcl
Note: See TracChangeset for help on using the changeset viewer.