client/tools/spacewalk-koan/spacewalk-koan.spec | 5 ++++- client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 10 ++++++++-- rel-eng/packages/spacewalk-koan | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-)

New commits: commit fde934091102ea5537f7c01c04a1937eca818ae0 Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 20 17:51:40 2013 +0100

Automatic commit of package [spacewalk-koan] release [2.1.4-1].

diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index 2a790cc..1a5aa0c 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 2.1.3 +Version: 2.1.4 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/

%changelog +* Fri Dec 20 2013 Milan Zazrivec mzazrivec@redhat.com 2.1.4-1 +- 967503 - use new Koan attribute + * Mon Oct 14 2013 Michael Mraka michael.mraka@redhat.com 2.1.3-1 - cleaning up old svn Ids

diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index a5bf460..304c564 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -2.1.3-1 client/tools/spacewalk-koan/ +2.1.4-1 client/tools/spacewalk-koan/

commit 72c696cca8a61d2c64a19ff9c6cfc2128378410b Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Dec 20 17:48:14 2013 +0100

967503 - use new Koan attribute

Name and semantics of grubby_copy_default attribute has changed: grubby_copy_default -> no_copy_default.

See cobbler.git commit 1fa66539bfafeaf380ea7f355c03a2e249baa486

diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 22448d4..23f8b6c 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -161,7 +161,10 @@ def initiate(kickstart_host, base, extra_append, static_device=None, system_reco k.kopts_override = None k.use_kexec = None k.embed_kickstart = None - k.grubby_copy_default = 0 + if hasattr(k, 'no_copy_default'): + k.no_copy_default = 1 + else: # older koan + k.grubby_copy_default = 0 if static_device: k.embed_kickstart = 1 k.run() @@ -239,7 +242,10 @@ def initiate_guest(kickstart_host, cobbler_system_name, virt_type, name, mem_kb, k.add_reinstall_entry = None k.kopts_override = None k.virt_auto_boot = None - k.grubby_copy_default = 0 + if hasattr(k, 'no_copy_default'): + k.no_copy_default = 1 + else: # older koan + k.grubby_copy_default = 0 k.run()

# refresh current virtualization state on the server