backend/satellite_tools/satCerts.py | 22 ++++++++++++++++++----
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
3 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit bb23eda42f34a5a900fb2cd4b3cd92d2ce13a48e
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Apr 2 10:54:35 2009 -0400
adding some additional checks before creating first org info
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 101c43a..f542dc0 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -544,6 +544,16 @@ def create_first_private_chan_family():
Check to see if org has a channelfamily associated with it.
If not, Create one.
"""
+ _lookup_chfam = """
+ SELECT 1 from rhnChannelFamily
+ WHERE label='private-channel-family-1'
+ """
+ h = rhnSQL.prepare(_lookup_chfam)
+ row = h.execute()
+ # some extra check for upgrades
+ if row:
+ # Already exists, move on
+ return
_query_create_chfam = """
INSERT INTO rhnChannelFamily
(id, name, label, org_id, product_url)
@@ -551,10 +561,14 @@ def create_first_private_chan_family():
"""
h = rhnSQL.prepare(_query_create_chfam)
- h.execute(name="Private Channel Family 1", \
- label="private-channel-family-1", \
- org=1, url="First Org Created")
-
+ try:
+ h.execute(name='Private Channel Family 1', \
+ label='private-channel-family-1', \
+ org=1, url='First Org Created')
+ except rhnSQL.SQLError, e:
+ # if we're here that means we're voilating something
+ raise e
+
def verify_family_permissions(orgid=1):
"""
commit 6d05320a4707c8757a3bc0987345744931ab6856
Merge: bea9453... d5661f4...
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Apr 2 10:18:10 2009 -0400
Merge branch 'VADER' of ssh://pkilambi@git.fedorahosted.org/git/spacewalk into
vader
commit bea9453378fbed4511a2d43bf7507d538bca6abf
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Wed Apr 1 10:07:31 2009 -0400
Automatic commit of package [rhnpush] release [0.4.7-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 2a49301..b37c129 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN
servers/proxies
Group: Applications/System
License: GPLv2
URL:
http://fedorahosted.org/spacewalk
-Version: 0.4.6
+Version: 0.4.7
Release: 1%{?dist}
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Wed Apr 01 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.4.7-1
+- new build for 485880 (pkilambi(a)redhat.com)
+
* Wed Apr 1 2009 Pradeep Kilambi <pkilambi(a)redhat.com>
- Resolves: 485880 - missing help and man options for rhnpush - new build
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index db58155..e1e0f3a 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-0.4.6-1 client/tools/rhnpush/
+0.4.7-1 client/tools/rhnpush/