diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-15 11:07:52 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-15 11:07:52 +0000 |
| commit | 5f795282b5e1a6d385a26221f74eac6b6f557133 (patch) | |
| tree | 89f18a450c62b3c65846aecb92b583803ed85e05 /scripts | |
| parent | 121595b9395b60bb07d8a7e093477004ec33ec19 (diff) | |
| download | master-187ad058-5f795282b5e1a6d385a26221f74eac6b6f557133.tar.gz master-187ad058-5f795282b5e1a6d385a26221f74eac6b6f557133.tar.bz2 master-187ad058-5f795282b5e1a6d385a26221f74eac6b6f557133.zip | |
scripts/feeds: remove useless install_method abstraction
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44778 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/scripts/feeds b/scripts/feeds index aa33af9f48..6e30b5a20f 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -347,7 +347,7 @@ sub list { return 0; } -sub install_generic() { +sub do_install_package($$) { my $feed = shift; my $pkg = shift; my $path = $pkg->{makefile}; @@ -366,17 +366,6 @@ sub install_generic() { return 0; } -my %install_method = ( - 'src-svn' => \&install_generic, - 'src-cpy' => \&install_generic, - 'src-link' => \&install_generic, - 'src-git' => \&install_generic, - 'src-gitsvn' => \&install_generic, - 'src-bzr' => \&install_generic, - 'src-hg' => \&install_generic, - 'src-darcs' => \&install_generic, -); - my %feed; sub lookup_package($$) { @@ -449,12 +438,7 @@ sub install_package { and warn "Overriding package '$src'\n" or warn "Installing package '$src'\n"; - $install_method{$type} or do { - warn "Unknown installation method: '$type'\n"; - return 1; - }; - - &{$install_method{$type}}($feed, $pkg) == 0 or do { + do_install_package($feed, $pkg) == 0 or do { warn "failed.\n"; return 1; }; |