Changeset 2181 in ProjectBuilder for devel/pb-modules

Timestamp:

Feb 20, 2017, 7:40:35 AM (7 years ago)

Author:

Bruno Cornec

Message:

Fix GPG key import

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -624 +624 @@
                 open(REPO,"$dest") || confess "Unable to open $dest";
                 while (<REPO>) {
-                    if ($_ =~ /^gpgkey=/) {
-                        $keyfile = $_;
-                        $keyfile =~ 's|gpgkey=||';
+                    $keyfile = $_;
+                    if ($keyfile =~ /^gpgkey=/) {
+                        $keyfile =~ s/gpgkey=//;
+                        last;
                     }
                 }
@@ -632 +633 @@
                 if (defined $keyfile) {
                     pb_system("wget -O $ENV{'PBTMP'}/$bn $keyfile","Downloading GPG key file $keyfile");
-                    pb_system("rpm --import $ENV{'PBTMP'}/$bn","Importing GPG key file $i");
+                    pb_system("sudo rpm --import $ENV{'PBTMP'}/$bn","Importing GPG key file $keyfile");
                     unlink("$ENV{'PBTMP'}/$bn");
                 }