projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: clarify the nand subtarget a bit
[oweals/openwrt.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index e51b17c37245b003055c35f4f77b4022cb2a8da1..3932a2d6d94dc10a615b89ad9ded0083e1118c26 100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-46,7
+46,7
@@
sub parse_config() {
$line[0] =~ /^src-\w+$/ or $valid = 0;
$line[1] =~ /^\w+$/ or $valid = 0;
@src = split /\s+/, $line[2];
$line[0] =~ /^src-\w+$/ or $valid = 0;
$line[1] =~ /^\w+$/ or $valid = 0;
@src = split /\s+/, $line[2];
- $valid or die "Syntax error in feeds.
list
, line: $line\n";
+ $valid or die "Syntax error in feeds.
conf
, line: $line\n";
$name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
$name{$line[1]} = 1;
$name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
$name{$line[1]} = 1;
@@
-179,6
+179,7
@@
sub search_feed {
my $substr;
my $pkgmatch = 1;
my $substr;
my $pkgmatch = 1;
+ next if $pkg->{vdepends};
foreach my $substr (@substr) {
my $match;
foreach my $key (qw(name title description src)) {
foreach my $substr (@substr) {
my $match;
foreach my $key (qw(name title description src)) {
@@
-212,6
+213,7
@@
sub list_feed {
get_feed($feed);
foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
my $pkg = $package{$name};
get_feed($feed);
foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
my $pkg = $package{$name};
+ next if $pkg->{vdepends};
if($pkg->{name}) {
printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
}
if($pkg->{name}) {
printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
}
@@
-384,6
+386,7
@@
sub install {
get_feed($f->[1]);
foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
my $p = $package{$name};
get_feed($f->[1]);
foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
my $p = $package{$name};
+ next if $p->{vdepends};
if( $p->{name} ) {
install_package($feed, $p->{name}) == 0 or $ret = 1;
}
if( $p->{name} ) {
install_package($feed, $p->{name}) == 0 or $ret = 1;
}