satellite/install/install.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2e4bb9e4a4f5b2d4a0d9e72c3c66e3f8bcc6e4f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 1 14:38:01 2012 +0200
The gpg-pubkey versions are lowercase while gpg shows the fingerprints as uppercase.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index caf009c..0ce51dc 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -712,7 +712,7 @@ sub import_gpg_key {
if (-f $gpg_key_file) {
my $file_content = `gpg $gpg_key_file 2> /dev/null`;
my ($fingerprint) = ($file_content =~ m!/(\S+)!);
- if (defined $fingerprint and system "rpm -q gpg-pubkey-$fingerprint >
/dev/null") {
+ if (defined $fingerprint and system "rpm -q gpg-pubkey-\L$fingerprint >
/dev/null") {
system "rpm --import $gpg_key_file";
}
}
commit c4a1be1f4a8dc0420082db545df0e8a014735871
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 1 14:36:59 2012 +0200
Avoid messages about /root/.gnupg being created.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index a3ff267..caf009c 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -710,7 +710,7 @@ sub install_updates_packages {
sub import_gpg_key {
my $gpg_key_file = '/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release';
if (-f $gpg_key_file) {
- my $file_content = `gpg $gpg_key_file`;
+ my $file_content = `gpg $gpg_key_file 2> /dev/null`;
my ($fingerprint) = ($file_content =~ m!/(\S+)!);
if (defined $fingerprint and system "rpm -q gpg-pubkey-$fingerprint >
/dev/null") {
system "rpm --import $gpg_key_file";
Show replies by date