Changeset 3110 in /cluster/svnroot


Ignore:
Timestamp:
Apr 7, 2011 3:18:04 PM (10 years ago)
Author:
fitz
Message:

Add --release option. closes #615.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/trunk/bin/build_livecd.pl

    r3091 r3110  
    4848my($debmirror,$websvn,$rc,$out,$ft,$tmpdir,$cwd,$svnrev,
    4949   $Bccd,$allout,$rpkgs,$nouid,$nogid,$debmirror_host,
    50    $debmirror_name,$debsecmirror,$dir);
     50   $debmirror_name,$debsecmirror,$dir,$release);
    5151my(@lsof,@pids,@rd);
    5252
     
    6363    "websvn=s" => \$opts{'websvn'},
    6464    "dir=s" => \$opts{'dir'},
     65    "release=s" => \$opts{'release'},
    6566    'help' => \$opts{'help'}
    6667    );
     
    198199}
    199200
     201if (defined($opts{'release'})) {
     202        $release = $opts{'release'};
     203
     204        if ($release =~ /\d+\.\d+\.\d+/) {
     205                $release .= ".$svnrev";
     206        } else {
     207                print "not ok - Malformed release number; Bailing out\n";
     208                exit;
     209        }
     210} else {
     211        $release = $svnrev;
     212}
     213
    200214$Bccd->run_test(
    201215    "chdir",
     
    657671    "w",
    658672    "$BUILDDIR/etc/$PROJECT-revision",
    659     "$svnrev",
     673    "$release",
    660674    );
    661675
     
    15311545    "regexsub_file",
    15321546    "",
    1533     "Adding revision to KNOPPIX boot file.",
     1547    "Adding version to KNOPPIX boot file.",
    15341548    "$tmpdir/KNOPPIX/boot/isolinux/boot.msg",
    15351549    "==REVISION==",
    1536     "$svnrev",
     1550    "$release",
    15371551    );
    15381552
Note: See TracChangeset for help on using the changeset viewer.