Changeset 13709


Ignore:
Timestamp:
2008-12-21T18:47:45+01:00 (9 years ago)
Author:
nbd
Message:

sync feeds script in 8.09 with trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/scripts/feeds

    r13189 r13709  
    8484 
    8585        system("$mk -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); 
    86         system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=4 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); 
     86        system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\""); 
    8787        system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index"); 
    8888 
     
    323323                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) { 
    324324                        next if $dep =~ /@/; 
    325                         next if $dep =~ /:/; 
    326325                        $dep =~ s/^\+//; 
     326                        $dep =~ s/^.+://; 
     327                        next unless $dep; 
    327328                        install_package($feed, $dep) == 0 or $ret = 1; 
    328329                } 
Note: See TracChangeset for help on using the changeset viewer.