backend/server/handlers/app/packages.py | 25 ++++++++++++-------------
schema/spacewalk/common/views/views.deps | 2 +-
2 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 7dbc7e0e5dcc597efccdd8233171b1cb6349f094
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 13:52:51 2009 +0100
made conditions more readable
diff --git a/backend/server/handlers/app/packages.py
b/backend/server/handlers/app/packages.py
index 7747978..f3da1e4 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -419,13 +419,12 @@ class Packages(RPC_Base):
orgid = info.get('org_id')
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate(username, password,
- channels=channels,
- null_org=1,
- force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate(username, password,
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate(username, password,
channels=channels,
+ null_org=null_org,
force=force)
return self._getPackageMD5sum(org_id, pkg_infos, info)
@@ -439,11 +438,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
@@ -564,11 +563,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
commit 730f0fd719677ed6e5725c9b7f22ab1000d66637
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:43:45 2009 +0100
fixed typo
diff --git a/schema/spacewalk/common/views/views.deps
b/schema/spacewalk/common/views/views.deps
index fe018f1..1704088 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -36,7 +36,7 @@ rhnChannelFamilyServerVirtual :: rhnServerEntitlementView \
rhnChannelFamilyMembers \
rhnServerChannel \
rhnServer
-hnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
+rhnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
rhnChannelFamilyPermissions :: rhnPublicChannelFamily \
rhnPrivateChannelFamily
rhnChannelFamilyServers :: rhnChannelFamilyMembers rhnChannelFamily \