Hi,

Yet again, I'm an idiot. The key_type should be gpg, not pgp. I would blame 
dyslexia, but I don't actually suffer from it. Perhaps I do. Anyway, 
updated/fixed patch below and this has been verified on Oracle Linux 6 too.

Note that this is ALREADY correct in git and the Spacewalk Nightly builds, so 
this email is for confirmation/sign-off purposes only. 

Signed-off-by: Avi Miller <avi.mil...@oracle.com>
---
 schema/spacewalk/common/data/rhnPackageKey.sql     |    3 +++
 .../038-oracle6key-rhnPackageKey.sql               |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/038-oracle6key-rhnPackageKey.sql

diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql 
b/schema/spacewalk/common/data/rhnPackageKey.sql
index ff1ba26..ce9d378 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -93,6 +93,9 @@ insert into rhnPackageKey (id, key_id, key_type_id, 
provider_id) values
 insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
 (sequence_nextval('rhn_pkey_id_seq'), '2e2bcdbcb38a8516', 
lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));

+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '72f97b74ec551f03', 
lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+

 -- Novell
 insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
diff --git 
a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/038-oracle6key-rhnPackageKey.sql
 
b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/038-oracle6key-rhnPackageKey.sql
new file mode 100644
index 0000000..c002bee
--- /dev/null
+++ 
b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/038-oracle6key-rhnPackageKey.sql
@@ -0,0 +1,3 @@
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+    (select sequence_nextval('rhn_pkey_id_seq'), '72f97b74ec551f03', 
lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.') from dual
+     where not exists (select 1 from rhnPackageKey where key_id = 
'72f97b74ec551f03'));
-- 
1.7.1


--
Oracle <http://www.oracle.com>
Avi Miller | Principal Program Manager | +61 (412) 229 687
Oracle Linux and Virtualization
417 St Kilda Road, Melbourne, Victoria 3004 Australia


_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to