KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts/feeds: return error status from feed update

Browse source 
This patch is a modified version of the patch being discussed at here:
https://patchwork.ozlabs.org/patch/471303/
from Martin Strbacka <martin.strbacka@nic.cz>

My version modifies scripts/feeds so that an error with one of the feeds just
raises the error flag, but script continues and tries to update the other
feeds. After all feeds have been updated, the script returns 1 if at least
one feed failed, and 0 on success with all feeds. The user can then utilise
the status in his build script, if he wants.

signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 46374
This commit is contained in:
Jo-Philipp Wich 2015-07-14 22:27:39 +00:00
parent 6c8c019b78
commit c5fbcf59e0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/feeds
View file

@ -687,6 +687,7 @@ sub update {
my %opts; my %opts;
my $feed_name; my $feed_name;
my $perform_update=1; my $perform_update=1;
my $failed=0;
$ENV{SCAN_COOKIE} = $$; $ENV{SCAN_COOKIE} = $$;
$ENV{OPENWRT_VERBOSE} = 's'; $ENV{OPENWRT_VERBOSE} = 's';
@ -711,8 +712,7 @@ sub update {
if ( ($#ARGV == -1) or $opts{a}) { if ( ($#ARGV == -1) or $opts{a}) {
foreach my $feed (@feeds) { foreach my $feed (@feeds) {
my ($type, $name, $src) = @$feed; my ($type, $name, $src) = @$feed;
next unless update_feed($type, $name, $src, $perform_update) == 1; update_feed($type, $name, $src, $perform_update) == 0 or $failed=1;
last;
} }
} else { } else {
while ($feed_name = shift @ARGV) { while ($feed_name = shift @ARGV) {
@ -721,14 +721,14 @@ sub update {
if($feed_name ne $name) { if($feed_name ne $name) {
next; next;
} }
update_feed($type, $name, $src, $perform_update); update_feed($type, $name, $src, $perform_update) == 0 or $failed=1;
} }
} }
} }
refresh_config(); refresh_config();
return 0; return $failed;
} }
sub feed_config() { sub feed_config() {