backend/satellite_exporter/satexport.py | 8 ++++++--
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit b4ee42402a572f6ca4a62a08d1377f1c791ab469
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 25 10:53:47 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.51-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 26053f9..5132abe 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.50
+Version: 1.10.51
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.51-1
+- 977878 - fixing checkstyle errors
+
* Tue Jun 25 2013 Grant Gainey 1.10.50-1
- ISS: checking a couple of potentially None values
- ISS: make sure new satellites can sync to old ones
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a05284d..c17f862 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.50-1 backend/
+1.10.51-1 backend/
commit c85e241f94205cc48248c75af5bb23edf3b235a1
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 25 10:53:22 2013 -0400
977878 - fixing checkstyle errors
diff --git a/backend/satellite_exporter/satexport.py
b/backend/satellite_exporter/satexport.py
index 4f01d69..553379b 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -209,8 +209,12 @@ class ApacheServer(BaseApacheServer):
raise rhnFault(2005, _('ISS is disabled on this satellite.'))
remote_hostname = req.get_remote_host(apache.REMOTE_DOUBLE_REV)
- row = rhnSQL.fetchone_dict("select id, allow_all_orgs from rhnISSSlave where
slave = :hostname and enabled = 'Y'",
- hostname = idn_pune_to_unicode(remote_hostname))
+ row = rhnSQL.fetchone_dict("""
+ select id, allow_all_orgs
+ from rhnISSSlave
+ where slave = :hostname
+ and enabled = 'Y'
+ """, hostname = idn_pune_to_unicode(remote_hostname))
if not row:
raise rhnFault(2004,
_('Server "%s" is not enabled for ISS.')
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 91c862e..26053f9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -422,6 +422,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/server/importlib/packageUpload.py*
%{pythonrhnroot}/server/importlib/productNamesImport.py*
%{pythonrhnroot}/server/importlib/userAuth.py*
+%{pythonrhnroot}/server/importlib/orgImport.py*
%{rhnroot}/server/handlers/__init__.py*
# Repomd stuff