client/tools/spacewalk-koan/spacewalk-koan.spec | 6 +++++-
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 6 +++++-
rel-eng/packages/spacewalk-koan | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 3d074563809cffb1c2d32678a9c670afe019695d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Aug 2 12:53:11 2012 -0400
Automatic commit of package [spacewalk-koan] release [1.8.2-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec
b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 1c8be1c..bb934e8 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/%{name}-%{version}.tar.gz
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
BuildArch : noarch
URL:
https://fedorahosted.org/spacewalk
@@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Thu Aug 02 2012 Stephen Herr <sherr(a)redhat.com> 1.8.2-1
+- 845326 - Show pretty error if customer specifies a MAC address already in use
+- %%defattr is not needed since rpm 4.4
+
* Mon Mar 19 2012 Jan Pazdziora 1.8.1-1
- 803320 - support for xz packed ramdisk (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index 36b5a03..526486f 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-1.8.1-1 client/tools/spacewalk-koan/
+1.8.2-1 client/tools/spacewalk-koan/
commit 924f950f51e6a28e65105cade2b76ef5b7ea8219
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Aug 2 12:52:38 2012 -0400
845326 - Show pretty error if customer specifies a MAC address already in use
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index 37f2e0a..0cb350c 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -247,7 +247,11 @@ def initiate_guest(kickstart_host, cobbler_system_name, virt_type,
name, mem_kb,
virtualization.support.refresh()
except Exception, e:
(xa, xb, tb) = sys.exc_info()
- if hasattr(e,"from_koan") and len(str(e)) > 1:
+ if str(xb).startswith("The MAC address you entered is already in
use"):
+ # I really wish there was a better way to check for this
+ error_messages['koan'] = str(xb)
+ print str(xb)
+ elif hasattr(e,"from_koan") and len(str(e)) > 1:
error_messages['koan'] = str(e)[1:-1]
print str(e)[1:-1] # nice exception, no traceback needed
else: