4 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 28 ----
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 68 ----------
2 files changed, 1 insertion(+), 95 deletions(-)
New commits:
commit c3df22849af1643ee4f1bdc460ceeda1cf61bede
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 17:11:53 2010 +0200
Remove no longer used constants.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 37acd17..b433907 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -55,9 +55,6 @@ WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy: "
"http://www.redhat.com/legal/privacy_statement.html")
BACK_REGISTER = _("Take me back to the setup process.")
-# Privacy Window
-TERMS_AND_CONDS_WINDOW = _("Review the Red Hat Network Terms And Conditions")
-
# Confirm Quit Window
CONFIRM_QUIT = _("Software update setup unsuccessful")
CONFIRM_QUIT_SURE = _("Are you sure you don't want to connect your system to Red Hat Network? "
@@ -89,24 +86,6 @@ EMAIL = _("*Email Address:")
SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for software updates:")
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
-# Subscription window.
-SUBSCRIPTION_WINDOW = _("Access a subscription")
-SUBSCRIPTION_INTRO = _("Your system will need to access a subscription. "
- "This will allow you to keep your system updated, secure, and supported.")
-SUBSCRIPTION_INFO = _("You have no active subscriptions available in your "
- "account. You will need to do one of the following to create an active "
- "subscription in your account before this system can connect to "
- "Red Hat Network:")
-SUBSCRIPTION_CHOICE1 = _("Log in to http://rhn.redhat.com/ and unentitle an inactive system at "
- "Your RHN > Subscription Management > System Entitlements.")
-SUBSCRIPTION_CHOICE2 = _("Purchase an additional Red Hat Enterprise Linux subscription at "
- "http://www.redhat.com/store/.")
-SUBSCRIPTION_CHOICE3 = _("Activate a new subscription with an installation number:")
-SUBSCRIPTION_CHOICE3_ALT = _("You have already activated this "
- "installation number during this registration.")
-ENTITLEMENT_NUM_PROMPT = _("Installation Number:")
-ENTITLEMENT_NUM_EXAMPLE = _("Example: XXXX-XXXX-XXXX-XXXX")
-
# Send Window
SEND_WINDOW = _("We are finished collecting information for the System Profile.\n\n"
"Press \"Next\" to send this System Profile to Red Hat Network. "
@@ -129,7 +108,6 @@ FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update' from this system's "
# Review Window
REVIEW_WINDOW = _("Review system subscription details")
REVIEW_WINDOW_PROMPT = _("Please review the subscription details below:")
-SUBSCRIPTIONS = _("Subscriptions Activated:")
SUB_NUM = _("The installation number %s was activated during "
"this system's initial connection to Red Hat Network.")
SUB_NUM_RESULT = _("Subscriptions have been activated for the following "
@@ -234,15 +212,9 @@ INST_NUM_ON_DISK = _("A subscription-activating installation number was f
"active subscription slots available in the rhn account instead. You may wish "
"to contact Red Hat customer service regarding this issue: "
"http://www.redhat.com/apps/support/")
-INST_NUM_ON_DISK_NA = _("A installation number was found on disk, but we " +
- "were not able to activate it (An unknown error occurred.) We used existing " +
- "active subscription slots available in the rhn account instead. You may wish " +
- "to contact Red Hat customer service regarding this issue: " +
- "http://www.redhat.com/apps/support/")
# Error Messages.
FATAL_ERROR = _("Fatal Error")
-RECOVERABLE_ERROR = _("Error")
WARNING = _("Warning")
HOSTED_CONNECTION_ERROR = _("We can't contact the Red Hat Network Server.\n\n"
"Double check the location provided - is '%s' correct?\n"
commit 0d7cb8f3eade57019893f60f1df37640e660ee73
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:49:40 2010 +0200
RecoverableErrorWindow no longer used in TUI, removing.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index c9abbac..ba9282f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -46,10 +46,6 @@ def FatalErrorWindow(screen, errmsg):
screen.finish()
sys.exit(1)
-def RecoverableErrorWindow(screen, errmsg):
- snack.ButtonChoiceWindow(screen, RECOVERABLE_ERROR, "%s" % errmsg,
- [OK])
-
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT,
CONFIRM_QUIT_SURE + "\n" + \
commit 8c0d13faccdb799d2c62132b97fa5e5cf094ecc0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:48:28 2010 +0200
Remove attributes of Tui that are no longer used.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 12b8d61..c9abbac 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1059,30 +1059,17 @@ class Tui:
"country" : "",
}
- self.activate_result = {}
- self.invalid_num_on_disk = 0
self.other = {}
self.other['registration_number'] = ''
self.profileName = ""
self.includeHardware = 1
- self.hostname = ""
- self.ip = ""
- self.cpu = ""
- self.speed = 0
- self.ram = ""
- self.os_release = ""
- self.activated_now = 0
- self.non_entitling_num_on_disk = 0
self.limited_updates_button = 1
self.all_updates_button = 0
self.includePackages = 0
self.packageList = []
self.selectedPackages = []
- self.read_reg_num = None
-
- self.saw_sub_window = 0
def _activate_hardware(self):
@@ -1106,7 +1093,6 @@ class Tui:
self.other['registration_number'] = \
activateHWResult.getRegistrationNumber()
rhnreg.writeHWCode(self.other['registration_number'])
- self.activated_now = 1
except up2dateErrors.NotEntitlingError:
log.log_debug('There are are no entitlements associated '
'with this hardware.')
commit 16fc993c75caf0e778e668aa147d359c28070e54
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:44:52 2010 +0200
No installation number activation, remove.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index d6ae2d6..12b8d61 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -921,55 +921,7 @@ class ReviewWindow:
# Build up the review_window_text based on the data in self.reg_info
review_window_text = REVIEW_WINDOW_PROMPT + "\n\n"
-
- if self.tui.other['registration_number'] and \
- not self.tui.non_entitling_num_on_disk and \
- not self.tui.invalid_num_on_disk:
- review_window_text += SUBSCRIPTIONS + "\n"
-
- # Test if we successfully activated an installation number
- if self.tui.activate_result.getStatus() == \
- rhnreg.ActivationResult.ACTIVATED_NOW:
-
- # Say we activated the #, and what it activated.
- review_window_text += SUB_NUM % \
- self.tui.other['registration_number'] + "\n\n"
-
- channels = self.tui.activate_result.getChannelsActivated()
- system_slots = self.tui.activate_result.getSystemSlotsActivated()
- log.log_debug('channels is %s' % channels)
- log.log_debug('slots is %s' % system_slots)
-
- seen = 0
- text = ""
- for channel in channels.keys():
- seen = 1
- text += channel + _(", quantity:") + \
- str(channels[channel]) + "\n"
-
- for system_slot in system_slots.keys():
- seen = 1
- text += system_slot + _(", quantity:") + \
- str(system_slots[system_slot]) + "\n"
-
- if seen:
- review_window_text += SUB_NUM_RESULT + "\n\n"
- review_window_text += text + "\n\n"
-
- # This is the case where we read the num from disk and it was
- # already activated.
- elif self.tui.activate_result.getStatus() == \
- rhnreg.ActivationResult.ALREADY_USED and \
- self.tui.read_reg_num:
- review_window_text += INST_NUM_ON_DISK + "\n\n"
-
- elif self.tui.read_reg_num and len(self.tui.read_reg_num) > 0 and \
- not self.tui.non_entitling_num_on_disk and \
- not self.tui.invalid_num_on_disk:
- # If we get here, it means we read a # off disk, but it wasn't a
- # valid num
- review_window_text += INST_NUM_ON_DISK_NA + "\n\n"
-
+
# Create and add the text for what channels the system was
# subscribed to.
if len(self.reg_info['channels']) > 0:
14 years
Changes to 'refs/tags/spacewalk-proxy-0.9.3-1'
by Michael Mraka
Tag 'spacewalk-proxy-0.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-29 21:33 +0000
Tagging package [spacewalk-proxy] version [0.9.3-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-0.9.16-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [0.9.3-1].
---
proxy/proxy/spacewalk-proxy.spec | 4 ++--
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
14 years
Changes to 'refs/tags/spacewalk-backend-0.9.16-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-29 21:33 +0000
Tagging package [spacewalk-backend] version [0.9.16-1] in directory [backend/].
Changes since spacewalk-proxy-0.9.2-1:
Michael Mraka (4):
made apacheUploadServer compatible with apacheServer
made satexport compatible with apacheServer
simplified wsgiHandler.get_handle()
Automatic commit of package [spacewalk-backend] release [0.9.16-1].
Shannon Hughes (2):
more hudson fixes
recover from eclipse cache
---
backend/satellite_exporter/satexport.py | 11 ++++--
backend/server/apacheUploadServer.py | 10 ++---
backend/spacewalk-backend.spec | 4 +-
backend/wsgi/package_push.py | 4 +-
backend/wsgi/package_upload.py | 4 +-
backend/wsgi/sat_dump.py | 4 +-
backend/wsgi/wsgiHandler.py | 18 +---------
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 -
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 -
proxy/proxy/wsgi/xmlrpc.py | 4 +-
proxy/proxy/wsgi/xmlrpc_redirect.py | 5 ++
rel-eng/packages/spacewalk-backend | 2 -
12 files changed, 37 insertions(+), 33 deletions(-)
---
14 years
2 commits - backend/spacewalk-backend.spec proxy/proxy rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-proxy | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a5145699af3060bebd9b1a3edcdd0b162d0194bf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 23:33:29 2010 +0200
Automatic commit of package [spacewalk-proxy] release [0.9.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index d797697..b95ba08 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -319,7 +319,7 @@ fi
%changelog
-* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
- modified to use mod_wsgi on Fedora 11 and 12
* Thu Mar 25 2010 Miroslav Suchy <msuchy(a)redhat.com> 0.9.1-1
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index a97434f..3dc5c8b 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-0.9.2-1 proxy/proxy/
+0.9.3-1 proxy/proxy/
commit 7a4c97ed2be571cb3c00db13c9b9e5255204180f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 23:33:07 2010 +0200
Automatic commit of package [spacewalk-backend] release [0.9.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b53b592..4ab8af8 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.9.15
+Version: 0.9.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -626,7 +626,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.15-1
+* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.16-1
- more modification to support mod_wsgi in proxy
* Fri Mar 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.14-1
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 49187d5..88e1b03 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.15-1 backend/
+0.9.16-1 backend/
14 years
3 commits - backend/satellite_exporter backend/server backend/wsgi proxy/proxy
by Michael Mraka
backend/satellite_exporter/satexport.py | 11 ++++++++---
backend/server/apacheUploadServer.py | 10 +++++-----
backend/wsgi/package_push.py | 4 +++-
backend/wsgi/package_upload.py | 4 +++-
backend/wsgi/sat_dump.py | 4 +++-
backend/wsgi/wsgiHandler.py | 18 +++---------------
proxy/proxy/wsgi/xmlrpc.py | 4 +++-
proxy/proxy/wsgi/xmlrpc_redirect.py | 5 ++++-
8 files changed, 32 insertions(+), 28 deletions(-)
New commits:
commit cc8441d4daf91aa6cbd94355ce74f6303a16a740
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 23:28:14 2010 +0200
simplified wsgiHandler.get_handle()
diff --git a/backend/wsgi/package_push.py b/backend/wsgi/package_push.py
index ea8b435..3aeef13 100644
--- a/backend/wsgi/package_push.py
+++ b/backend/wsgi/package_push.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "package_push","server.upload.package-push", type="upload")
+ return wsgiHandler.handle(environ, start_response,
+ "package_push", "server.upload.package-push",
+ "server.apacheUploadServer")
diff --git a/backend/wsgi/package_upload.py b/backend/wsgi/package_upload.py
index 22c03c9..78beef4 100644
--- a/backend/wsgi/package_upload.py
+++ b/backend/wsgi/package_upload.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "package","server.upload.package", type="upload")
+ return wsgiHandler.handle(environ, start_response,
+ "package", "server.upload.package",
+ "server.apacheUploadServer")
diff --git a/backend/wsgi/sat_dump.py b/backend/wsgi/sat_dump.py
index d2104aa..f934b68 100644
--- a/backend/wsgi/sat_dump.py
+++ b/backend/wsgi/sat_dump.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "non_auth_dumper", "server.satexport.internal", type='exporter')
+ return wsgiHandler.handle(environ, start_response,
+ "non_auth_dumper", "server.satexport.internal",
+ "satellite_exporter.satexport")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 8ee6763..6879b48 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -19,7 +19,7 @@ from wsgi import wsgiRequest
from common import log_debug
-def handle(environ, start_response, server, component_type, type="normal"):
+def handle(environ, start_response, server, component_type, type="server.apacheServer"):
#wsgi seems to capitalize incoming headers and add HTTP- to the front :/
# so we strip out the first 5 letters, and transform it into what we want.
replacements = {'_':'-', 'Rhn':'RHN', 'Md5Sum':'MD5sum', 'Xml':'XML'}
@@ -64,18 +64,6 @@ def handle(environ, start_response, server, component_type, type="normal"):
return req.output
def get_handle(type, name, init=0):
- if type == 'upload':
- from server import apacheUploadServer
- return apacheUploadServer.HandlerWrap(name)
- #the sat export module doesn't provide a nice server module
- elif type == 'exporter':
- from satellite_exporter import satexport
- return satexport.HandlerWrap(name)
- elif type == 'proxy':
- from proxy import apacheServer
- return apacheServer.HandlerWrap(name, init=init)
- else:
- from server import apacheServer
- return apacheServer.HandlerWrap(name, init=init)
-
+ handler_module = __import__(type, globals(), locals(), ['HandlerWrap'])
+ return handler_module.HandlerWrap(name, init)
diff --git a/proxy/proxy/wsgi/xmlrpc.py b/proxy/proxy/wsgi/xmlrpc.py
index 33bfc73..eca662e 100644
--- a/proxy/proxy/wsgi/xmlrpc.py
+++ b/proxy/proxy/wsgi/xmlrpc.py
@@ -17,4 +17,6 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "broker","proxy.broker", "proxy")
+ return wsgiHandler.handle(environ, start_response,
+ "broker", "proxy.broker",
+ "proxy.apacheServer")
diff --git a/proxy/proxy/wsgi/xmlrpc_redirect.py b/proxy/proxy/wsgi/xmlrpc_redirect.py
index b734169..60034f6 100644
--- a/proxy/proxy/wsgi/xmlrpc_redirect.py
+++ b/proxy/proxy/wsgi/xmlrpc_redirect.py
@@ -17,4 +17,7 @@
from wsgi import wsgiHandler
def application(environ, start_response):
- return wsgiHandler.handle(environ, start_response, "redirect","proxy.redirect", "proxy")
+ return wsgiHandler.handle(environ, start_response,
+ "redirect", "proxy.redirect",
+ "proxy.apacheServer")
+
commit 356bddff66b3f7c50ff06f7062d8d111c3f189ff
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 22:52:16 2010 +0200
made satexport compatible with apacheServer
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 84957ce..8fca481 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -241,6 +241,11 @@ class FunctionRetrievalError(Exception):
pass
apache_server = ApacheServer()
-headerParserHandler = apache_server.headerParserHandler
-handler = apache_server.handler
-cleanupHandler = apache_server.cleanupHandler
+class HandlerWrap:
+ def __init__(self, name, init=0):
+ return getattr(apache_server, name)
+
+### Instantiate external entry points:
+headerParserHandler = HandlerWrap("headerParserHandler")
+handler = HandlerWrap("handler")
+cleanupHandler = HandlerWrap("cleanupHandler")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 7222428..8ee6763 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -70,7 +70,7 @@ def get_handle(type, name, init=0):
#the sat export module doesn't provide a nice server module
elif type == 'exporter':
from satellite_exporter import satexport
- return getattr(satexport, name)
+ return satexport.HandlerWrap(name)
elif type == 'proxy':
from proxy import apacheServer
return apacheServer.HandlerWrap(name, init=init)
commit 3d9dd333fe556e77932193e34cf0a1374653faa0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 22:09:02 2010 +0200
made apacheUploadServer compatible with apacheServer
diff --git a/backend/server/apacheUploadServer.py b/backend/server/apacheUploadServer.py
index fd8acf7..b1c6aad 100644
--- a/backend/server/apacheUploadServer.py
+++ b/backend/server/apacheUploadServer.py
@@ -24,7 +24,7 @@ from common import CFG, initCFG, log_debug, log_error, log_setreq, initLOG, \
Traceback, rhnFault, rhnFlags
from server import apacheServer, rhnImport
-class UploadHandlerWrap(apacheServer.HandlerWrap):
+class HandlerWrap(apacheServer.HandlerWrap):
def get_handler_factory(self, req):
return UploadHandler
@@ -146,7 +146,7 @@ Error Class Info: %s
string.rstrip(exception.arrayText))
### Instantiate external entry points:
-HeaderParserHandler = UploadHandlerWrap("headerParserHandler", init=1)
-Handler = UploadHandlerWrap("handler")
-CleanupHandler = UploadHandlerWrap("cleanupHandler")
-LogHandler = UploadHandlerWrap("logHandler")
+HeaderParserHandler = HandlerWrap("headerParserHandler", init=1)
+Handler = HandlerWrap("handler")
+CleanupHandler = HandlerWrap("cleanupHandler")
+LogHandler = HandlerWrap("logHandler")
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 9f4a09f..7222428 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -66,7 +66,7 @@ def handle(environ, start_response, server, component_type, type="normal"):
def get_handle(type, name, init=0):
if type == 'upload':
from server import apacheUploadServer
- return apacheUploadServer.UploadHandlerWrap(name)
+ return apacheUploadServer.HandlerWrap(name)
#the sat export module doesn't provide a nice server module
elif type == 'exporter':
from satellite_exporter import satexport
14 years
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 809f87e532aec24962548ab6de4d1d8fe36bac55
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon Mar 29 16:53:33 2010 -0400
recover from eclipse cache
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 79522c8..b648a7e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1155,7 +1155,7 @@ GROUP BY C.id, C.name
<mode name="channel_errata_packages" class="com.redhat.rhn.frontend.dto.PackageDto">
<query params="eid, cid">
- SELECT P.id, CS.checksum, CS.checksum_type checksumType,
+ SELECT P.id, CS.checksum, CS.checksum_type checksum_type,
PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label name
14 years
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e35055b631ab4c33de5ad25796dcd53efdcd8ec3
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon Mar 29 15:53:40 2010 -0400
more hudson fixes
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index e3e2330..79522c8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1155,7 +1155,7 @@ GROUP BY C.id, C.name
<mode name="channel_errata_packages" class="com.redhat.rhn.frontend.dto.PackageDto">
<query params="eid, cid">
- SELECT P.id, CS.checksum, CS.checksum_type checksumtype,
+ SELECT P.id, CS.checksum, CS.checksum_type checksumType,
PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label name
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index 9f4510a..0e00dc5 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -213,7 +213,7 @@ public class PackageDto extends BaseDto {
*
* @param checksumTypeIn The checksumtype to set
*/
- public void setChecksumtype(String checksumTypeIn) {
+ public void setChecksumType(String checksumTypeIn) {
this.checksumType = checksumTypeIn;
}
14 years
Changes to 'refs/tags/spacewalk-proxy-0.9.2-1'
by Michael Mraka
Tag 'spacewalk-proxy-0.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-29 19:44 +0000
Tagging package [spacewalk-proxy] version [0.9.2-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-0.9.15-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [0.9.2-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years
Changes to 'refs/tags/spacewalk-backend-0.9.15-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-29 19:42 +0000
Tagging package [spacewalk-backend] version [0.9.15-1] in directory [backend/].
Changes since rhn-client-tools-0.9.9-1:
Joshua Roys (1):
Remove audit review cruft from spacewalk-setup
Michael Mraka (16):
let's use something non-mod_python specific
removed duplicated file (there is another copy in ../)
removed non-used non-referenced file
switched to mod_wsgi on newer systems
reshuffled httpd config files
put new http config files into spacewalk-proxy-common
removed section already defined in spacewalk-proxy.conf
added first draft of proxy mod_wsgi configuration :)
added switch to package mod_python or mod_wsgi config file
added mod_wsgi handlers
packed mod_wsgi handlers into rpm
mod_wsgi is already loaded in wsgi.conf
proxy dislikes mod_wsgi's cgi-like headers but wanna see uri
import handlers on demand
requires mod_wsgi rutines from spacewalk-backend
Automatic commit of package [spacewalk-backend] release [0.9.15-1].
Shannon Hughes (1):
fixing unit test breakage for dto method name
---
backend/spacewalk-backend.spec | 5
backend/wsgi/wsgiHandler.py | 9
backend/wsgi/wsgiRequest.py | 2
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2
java/spacewalk-java.spec | 2
proxy/proxy/Makefile.proxy | 2
proxy/proxy/apacheHandler.py | 2
proxy/proxy/apacheServer.py | 2
proxy/proxy/broker/rhnBroker.py | 2
proxy/proxy/changes-notes-v3x.txt | 112 -
proxy/proxy/httpd-conf/proxy_broker.conf | 36
proxy/proxy/httpd-conf/proxy_redirect.conf | 42
proxy/proxy/httpd-conf/rhn_proxy.conf | 88
proxy/proxy/httpd-conf/spacewalk-proxy-python.conf | 91
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 17
proxy/proxy/httpd-conf/spacewalk-proxy.conf | 57
proxy/proxy/httpd.conf.sample | 1461 --------------
proxy/proxy/redirect/rhnRedirect.py | 2
proxy/proxy/rhnShared.py | 11
proxy/proxy/spacewalk-proxy.spec | 27
proxy/proxy/wsgi/Makefile | 9
proxy/proxy/wsgi/xmlrpc.py | 20
proxy/proxy/wsgi/xmlrpc_redirect.py | 20
rel-eng/packages/spacewalk-backend | 2
spacewalk/setup/bin/spacewalk-setup | 6
25 files changed, 264 insertions(+), 1765 deletions(-)
---
14 years
2 commits - backend/spacewalk-backend.spec proxy/proxy rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-proxy | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 7ab09a8a72cebc92a5c55fb22a13552d5236a9e7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 21:44:05 2010 +0200
Automatic commit of package [spacewalk-proxy] release [0.9.2-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 7718cec..d797697 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -319,6 +319,9 @@ fi
%changelog
+* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+- modified to use mod_wsgi on Fedora 11 and 12
+
* Thu Mar 25 2010 Miroslav Suchy <msuchy(a)redhat.com> 0.9.1-1
- 566124 - do not distribute jabber configuration file
- user spacewalk-setup-jabberd to configure jabberd
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 74eabf7..a97434f 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-0.9.1-1 proxy/proxy/
+0.9.2-1 proxy/proxy/
commit 5174c6b38f3a64e351562c05dd07a232a4969819
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 21:42:59 2010 +0200
Automatic commit of package [spacewalk-backend] release [0.9.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1acdfd8..b53b592 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.9.14
+Version: 0.9.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -626,6 +626,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Mar 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.15-1
+- more modification to support mod_wsgi in proxy
+
* Fri Mar 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.14-1
- fixed spacewalk-backend packaging
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2d2541a..49187d5 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.14-1 backend/
+0.9.15-1 backend/
14 years