aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-01-22 13:13:09 +0000
committerJohn Crispin <blogic@openwrt.org>2015-01-22 13:13:09 +0000
commit6b66328ef4da52e119960fb2cade0d55a6c667c0 (patch)
treec9e4655320af1c3f6d4cf6c42b78b7f1a9fad3d5 /scripts
parent9154a994801e65cc1e43ed7af7881c00ce26ac10 (diff)
downloadupstream-6b66328ef4da52e119960fb2cade0d55a6c667c0.tar.gz
upstream-6b66328ef4da52e119960fb2cade0d55a6c667c0.tar.bz2
upstream-6b66328ef4da52e119960fb2cade0d55a6c667c0.zip
build: revert r44076
the patch causes issues when installing feeds Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44078 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/feeds25
1 files changed, 7 insertions, 18 deletions
diff --git a/scripts/feeds b/scripts/feeds
index 6c0337581c..31ad544994 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -358,7 +358,6 @@ sub is_core_package($) {
sub install_package {
my $feed = shift;
my $name = shift;
- my $force = shift;
my $ret = 0;
$feed = lookup_package($feed, $name);
@@ -384,22 +383,13 @@ sub install_package {
$src or $src = $name;
# previously installed packages set the runtime package
- # newly installed packages set the source package to 1
- $installed{$src} and $installed{$src} == 1 and return 0;
-
- # we'll trigger the override only with the 3 conditions below:
- # - override is allowed by command line (-f)
- # - a package with the same src exists in the core packages list
- # - the package previously installed is not from a feed
- my $override = 1 if ($force and is_core_package($src) and !$installed{$src}->{feed});
+ # newly installed packages set the source package
+ $installed{$src} and return 0;
# check previously installed packages
- $installed{$name} and !$override and return 0;
+ $installed{$name} and return 0;
$installed{$src} = 1;
-
- $override == 1
- and warn "Overriding package '$src'\n"
- or warn "Installing package '$src'\n";
+ warn "Installing package '$src'\n";
$install_method{$type} or do {
warn "Unknown installation method: '$type'\n";
@@ -446,7 +436,7 @@ sub install {
my $feed;
my $ret = 0;
- getopts('ap:d:fh', \%opts);
+ getopts('ap:d:h', \%opts);
if ($opts{h}) {
usage();
@@ -472,7 +462,7 @@ sub install {
my $p = $feed_package->{$name};
next if $p->{vdepends};
if( $p->{name} ) {
- install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
+ install_package($feed, $p->{name}) == 0 or $ret = 1;
get_feed($f->[1]);
}
}
@@ -480,7 +470,7 @@ sub install {
}
} else {
while ($name = shift @ARGV) {
- install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
+ install_package($feed, $name) == 0 or $ret = 1;
}
}
@@ -648,7 +638,6 @@ Commands:
-a : Install all packages from all feeds or from the specified feed using the -p option.
-p <feedname>: Prefer this feed when installing packages.
-d <y|m|n>: Set default for newly installed packages.
- -f : Install will be forced even if the package exists in core OpenWrt (override)
search [options] <substring>: Search for a package
Options: