Changeset 1991

Show
Ignore:
Timestamp:
12/13/07 15:13:33 (5 months ago)
Author:
joshr
Message:

show the correct location of the new .src.rpm file, and
use $c->{value}, not $config{value}.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • swish_website/bin/swish-daily.pl

    r1985 r1991  
    185185    # if we're in --timestamp mode, then we need to make sure that the tarball 
    186186    # unpacks into EG: swish-e-2.5.6, and not swish-e-2.5.6-2007-12-12 
    187     if ($config{timestamp}) { 
     187    if ($c->{timestamp}) { 
    188188 
    189189        my $origspecversion = $specversion; 
     
    212212 
    213213    # also, if in timestamp mode, change the specrelease to be YYYYMMDD 
    214     if ($config{timestamp}) { 
     214    if ($c->{timestamp}) { 
    215215        chomp(my $specrelease = `date '+%Y%m%d'`);  # normally this is a 1-2 digits 
    216216        _apply_regexes( "$rpmbuilddir/SPECS/swish-e.spec",  
     
    222222    run_command( "rpmbuild --rcfile=$rpmrcfile -bs $rpmbuilddir/SPECS/swish-e.spec" ); 
    223223 
    224     log_message( "new .src.rpm build in $rpmbuilddir/SRPMS" ); 
    225  
    226     # now move the .src.rpm to the tardir 
     224        # now move the .src.rpm to the tardir 
    227225    run_command( "mv $rpmbuilddir/SRPMS/swish-e-*.src.rpm $c->{tardir}" ); 
     226 
     227        # log that it's there 
     228    log_message( "new .src.rpm in $c->{tardir}" ); 
    228229} 
    229230