no_comment

1 files changed, 8 insertions, 7 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 39b67f512..48501982d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -245,7 +245,7 @@ sub selectPackagesToUpgrade {
 }
 
 sub choosePackages {
-    my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_;
+    my ($o, $packages, $compss, $compssUsers, $first_time) = @_;
 
     #- now for upgrade, package that must be upgraded are
     #- selected first, after is used the same scheme as install.
@@ -287,6 +287,9 @@ sub beforeInstallPackages {
 	}
     }
 
+    #- copy RPM-GPG *before* installing packages (otherwise may be the CD2)
+    install_any::getAndSaveFile('RPM-GPG-KEYS', "$o->{prefix}/root/tmp/RPM-GPG-KEYS");
+
     log::l("before install packages, after copy");
     #- some packages need such files for proper installation.
     any::writeandclean_ldsoconf($o->{prefix});
@@ -437,12 +440,10 @@ Consoles 1,3,4,7 may also contain interesting information";
 	install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]);
 	substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec;
     }
-    {
-	my $f = "$o->{prefix}/root/tmp/RPM-GPG-KEYS";
-	install_any::getAndSaveFile('RPM-GPG-KEYS', $f);
-	run_program::rooted($o->{prefix}, qw(gpg --import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS));
-	unlink $f;
-    }
+
+    #- RPM-GPG-KEYS is copied earlier to ensure we have it
+    run_program::rooted($o->{prefix}, qw(gpg --import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS));
+    unlink "$o->{prefix}/root/tmp/RPM-GPG-KEYS";
 
 #    #- update language and icons for KDE.
 #    update_userkderc($o->{prefix}, 'Locale', Language => "");