Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 29 insertions, 31 deletions

diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am
index 15c9cab..d123977 100644
--- a/dselect/methods/Makefile.am
+++ b/dselect/methods/Makefile.am
@@ -1,6 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-methodsdir = $(pkglibexecdir)/methods
+nobase_dist_perllib_DATA = \
+	Dselect/Method.pm \
+	Dselect/Method/Ftp.pm \
+	# EOL
 
 nobase_dist_methods_DATA = \
 	file/names \
@@ -23,12 +26,6 @@ nobase_methods_SCRIPTS = \
 	media/update \
 	# EOL
 
-perllibdir = $(PERL_LIBDIR)
-nobase_dist_perllib_DATA = \
-	Dselect/Method.pm \
-	Dselect/Method/Ftp.pm \
-	# EOL
-
 EXTRA_DIST = \
 	file/setup.sh \
 	file/update.sh \
diff --git a/dselect/methods/Makefile.in b/dselect/methods/Makefile.in
index 7dfe739..956af07 100644
--- a/dselect/methods/Makefile.in
+++ b/dselect/methods/Makefile.in
@@ -319,6 +319,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aclocaldir = @aclocaldir@
 admindir = @admindir@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -326,6 +327,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 backupsdir = @backupsdir@
+bashcompletionsdir = @bashcompletionsdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -337,6 +339,7 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 devlibdir = @devlibdir@
 docdir = @docdir@
+docspecdir = @docspecdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -354,10 +357,14 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 logdir = @logdir@
 mandir = @mandir@
+methodsdir = @methodsdir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+perllibdir = @perllibdir@
 pkgconfdir = @pkgconfdir@
+pkgconfigdir = @pkgconfigdir@
+polkitactionsdir = @polkitactionsdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -371,7 +378,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zshcompletionsdir = @zshcompletionsdir@
-methodsdir = $(pkglibexecdir)/methods
+nobase_dist_perllib_DATA = \
+	Dselect/Method.pm \
+	Dselect/Method/Ftp.pm \
+	# EOL
+
 nobase_dist_methods_DATA = \
 	file/names \
 	file/desc.file \
@@ -393,12 +404,6 @@ nobase_methods_SCRIPTS = \
 	media/update \
 	# EOL
 
-perllibdir = $(PERL_LIBDIR)
-nobase_dist_perllib_DATA = \
-	Dselect/Method.pm \
-	Dselect/Method/Ftp.pm \
-	# EOL
-
 EXTRA_DIST = \
 	file/setup.sh \
 	file/update.sh \
diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl
index ea6ea71..75647bd 100755
--- a/dselect/methods/ftp/install.pl
+++ b/dselect/methods/ftp/install.pl
@@ -297,16 +297,14 @@ if($totsize == 0) {
 	    if ($rsize + $totsize > $avsp) {
 		print "no room for: $fn\n";
 		delete $downloads{$fn};
-	    } else {
-		if(yesno($def, $downloads{$fn}
-			 ? "download: $fn ${rsize}k/${csize}k (total = ${totsize}k)"
-			 : "download: $fn ${rsize}k (total = ${totsize}k)")) {
-		    $def = 'y';
-		    $totsize += $rsize;
-		} else {
-		    $def = 'n';
-		    delete $downloads{$fn};
-		}
+            } elsif (yesno($def, $downloads{$fn}
+                           ? "download: $fn ${rsize}k/${csize}k (total = ${totsize}k)"
+                           : "download: $fn ${rsize}k (total = ${totsize}k)")) {
+                $def = 'y';
+                $totsize += $rsize;
+            } else {
+                $def = 'n';
+                delete $downloads{$fn};
 	    }
 	}
     }
@@ -588,13 +586,11 @@ sub removeinstalled {
 	    my($pkg, $ver) = getdebinfo($fn);
 	    if(!defined($pkg) || !defined($ver)) {
 		print "Could not get info for: $dir/$fn\n";
-	    } else {
-		if ($curpkgs{$pkg} and dcmpvers($ver, 'le', $curpkgs{$pkg})) {
-		    print "deleting: $dir/$fn\n";
-		    unlink $fn;
-		} else {
-		    print "leaving: $dir/$fn\n";
-		}
+            } elsif ($curpkgs{$pkg} and dcmpvers($ver, 'le', $curpkgs{$pkg})) {
+                print "deleting: $dir/$fn\n";
+                unlink $fn;
+            } else {
+                print "leaving: $dir/$fn\n";
 	    }
 	} else {
 	    print "non-debian: $dir/$fn\n";