rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-report | 9 ++-------
reporting/spacewalk-reports.spec | 5 ++++-
3 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit c7de0916f0d76bbd233d489025f771338755f922
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 25 09:26:30 2010 +0100
Automatic commit of package [spacewalk-reports] release [1.3.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index ff304e9..0500797 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.2.3-1 reporting/
+1.3.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 49ba132..64ba0d2 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Thu Nov 25 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
+- fixed namespace of imported modules
+
* Mon Sep 20 2010 Jan Pazdziora 1.2.3-1
- 634961 - stop null/None values from being presented as "None".
commit 78028666e4cefa22dc9d03effb0b52b3dbfd0eb2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 25 09:24:51 2010 +0100
fixed namespace of imported modules
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 8b6978b..37f74ab 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -32,17 +32,12 @@ except KeyboardInterrupt:
systemExit(-1, "\nUser interrupted process.")
-_LIBPATH = "/usr/share/rhn"
-# add to the path if need be
-if _LIBPATH not in sys.path:
- sys.path.append(_LIBPATH)
-
sys.path.append('/usr/share/spacewalk')
import reports
try:
- from server import rhnSQL
- from common import initCFG
+ from spacewalk.server import rhnSQL
+ from spacewalk.common import initCFG
except KeyboardInterrupt:
systemExit(-1, "\nUser interrupted process.")