java/conf/cobbler/snippets/post_reactivation_key | 9 ++++++++- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-)

New commits: commit 593eacd6f0d89c2864e972eda54236d68c1defd5 Author: Stephen Herr sherr@redhat.com Date: Mon Jul 29 12:59:16 2013 -0400

Automatic commit of package [spacewalk-java] release [2.1.8-1].

diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f91b564..7cde342 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.7 +Version: 2.1.8 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -771,6 +771,9 @@ fi %{jardir}/postgresql-jdbc.jar

%changelog +* Mon Jul 29 2013 Stephen Herr sherr@redhat.com 2.1.8-1 +- 989630 - Allow user to hackisly add their own keys during the kickstart + * Thu Jul 25 2013 Grant Gainey ggainey@redhat.com 2.1.7-1 - 987977 - Fix there-can-be-solaris issue and make Upgrade behave like everything else diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index cf5150a..390da2c 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.7-1 java/ +2.1.8-1 java/

commit 874edc119d880b15878722be68f9afc27bd9e433 Author: Stephen Herr sherr@redhat.com Date: Mon Jul 29 12:58:55 2013 -0400

989630 - Allow user to hackisly add their own keys during the kickstart

diff --git a/java/conf/cobbler/snippets/post_reactivation_key b/java/conf/cobbler/snippets/post_reactivation_key index 369deab..907a75e 100644 --- a/java/conf/cobbler/snippets/post_reactivation_key +++ b/java/conf/cobbler/snippets/post_reactivation_key @@ -6,6 +6,7 @@ try: import os.path old_system_id = "/tmp/rhn/systemid" new_system_id = "/mnt/sysimage/root/systemid.old" + tmp_key = "/mnt/sysimage/tmp/key"

new_keys = "$redhat_management_key" for key in new_keys.split(','): @@ -14,7 +15,13 @@ try: if os.path.exists(old_system_id): client = xmlrpclib.Server("http://$redhat_management_server/rpc/api") key = client.system.obtain_reactivation_key(open(old_system_id).read()) - f = open("/mnt/sysimage/tmp/key","w") + if os.path.exists(tmp_key): + f = open(tmp_key, "r+") + contents = f.read() + if contents and not contents[-1] == ',': + f.write(',') + else: + f = open(tmp_key, "w") f.write(key) f.close() shutil.copy(old_system_id, new_system_id)