Changes to 'refs/tags/spacewalk-java-1.5.54-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.54-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-12 15:16 +0000
Tagging package [spacewalk-java] version [1.5.54-1] in directory [java/].
Changes since spacewalk-proxy-1.5.9-1:
Jan Pazdziora (2):
Using http://struts.apache.org/tags-* uris, fixing build issue on Fedoras and RHEL 6.
Automatic commit of package [spacewalk-java] release [1.5.54-1].
---
java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 4 ++--
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
12 years, 9 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 259e2a8db998c648eb223ed34475ad7078c2d7a9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jul 12 17:16:14 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.54-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 385f1c4..e4f61b7 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.53
+Version: 1.5.54
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jul 12 2011 Jan Pazdziora 1.5.54-1
+- Using http://struts.apache.org/tags-* uris, fixing build issue on Fedoras and
+ RHEL 6.
+
* Mon Jul 11 2011 Jan Pazdziora 1.5.53-1
- 719632 - include security token in system search filter
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4b0f334..a1e34a1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.53-1 java/
+1.5.54-1 java/
12 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-1.5.9-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-07-11 15:47 +0000
Tagging package [spacewalk-proxy] version [1.5.9-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-1.5.38-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-proxy] release [1.5.9-1].
---
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.5.38-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.38-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-07-11 15:46 +0000
Tagging package [spacewalk-backend] version [1.5.38-1] in directory [backend/].
Changes since spacewalk-web-1.5.15-1:
Miroslav Suchý (13):
shorten lines
W:505: Found indentation with tabs instead of spaces
W: 25: Wildcard import rhnConstants
W: 23: Uses of a deprecated module 'string'
C:380:apacheHandler.response_file: Comma not followed by a space
W: 31: Unused import initLOG
C: 24: Comma not followed by a space
C: 65: Line too long (89/80)
C: 19: Line too long (81/80)
remove unnecessary XXX - make pylint happy
W: 23: Unused import urlsplit
optparse is here since python 2.3 - remove optik
Automatic commit of package [spacewalk-backend] release [1.5.38-1].
---
backend/satellite_tools/rhn-charsets | 8 ----
backend/satellite_tools/rhn-schema-version | 8 ----
backend/spacewalk-backend.spec | 5 ++
client/tools/osad/src/jabber_lib.py | 5 --
client/tools/rhncfg/config_common/handler_base.py | 3 -
client/tools/rhnpush/rhnpush.py | 5 --
proxy/installer/rhn_proxy_activate.py | 5 --
proxy/proxy/apacheHandler.py | 40 +++++++++++-----------
proxy/proxy/broker/rhnBroker.py | 8 ++--
proxy/proxy/pm/rhn_package_manager.py | 5 --
proxy/proxy/responseContext.py | 4 +-
proxy/proxy/rhnAuthCacheClient.py | 5 +-
rel-eng/packages/spacewalk-backend | 2 -
13 files changed, 43 insertions(+), 60 deletions(-)
---
12 years, 9 months
14 commits - backend/satellite_tools backend/spacewalk-backend.spec client/tools proxy/installer proxy/proxy rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/rhn-charsets | 8 ----
backend/satellite_tools/rhn-schema-version | 8 ----
backend/spacewalk-backend.spec | 5 ++
client/tools/osad/src/jabber_lib.py | 5 --
client/tools/rhncfg/config_common/handler_base.py | 3 -
client/tools/rhnpush/rhnpush.py | 5 --
proxy/installer/rhn_proxy_activate.py | 5 --
proxy/proxy/apacheHandler.py | 40 +++++++++++-----------
proxy/proxy/broker/rhnBroker.py | 8 ++--
proxy/proxy/pm/rhn_package_manager.py | 5 --
proxy/proxy/responseContext.py | 4 +-
proxy/proxy/rhnAuthCacheClient.py | 5 +-
proxy/proxy/spacewalk-proxy.spec | 6 ++-
rel-eng/packages/spacewalk-backend | 2 -
rel-eng/packages/spacewalk-proxy | 2 -
15 files changed, 49 insertions(+), 62 deletions(-)
New commits:
commit f368e6671a69df7a882c94e4fa0df0745ff793e7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 17:47:11 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.9-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 0d5d1a4..db172f9 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: 1.5.8
+Version: 1.5.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Mon Jul 11 2011 Miroslav Suchý 1.5.9-1
+- optparse is here since python 2.3 - remove optik (msuchy(a)redhat.com)
+- code cleanup
+
* Fri Jun 17 2011 Miroslav Suchý 1.5.8-1
- 710433 - if we get data chunked, httplib of python will join them, so it is
not correct to send chunked header when data may not be chunked
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index e3d99d0..81e589e 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.8-1 proxy/proxy/
+1.5.9-1 proxy/proxy/
commit 8e82748931bb44d3eb4d8795ce1040c19c56e587
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 17:46:40 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.38-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 74188eb..ee77bfc 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.37
+Version: 1.5.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Jul 11 2011 Miroslav Suchý 1.5.38-1
+- optparse is here since python 2.3 - remove optik (msuchy(a)redhat.com)
+
* Fri Jul 08 2011 Miroslav Suchý 1.5.37-1
- do not log every action_extra_data as error (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 92dcdcb..677c968 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.37-1 backend/
+1.5.38-1 backend/
commit cce8cf57be9e2a4cdeff498db164df7e6fc66364
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:59:01 2011 +0200
optparse is here since python 2.3 - remove optik
diff --git a/backend/satellite_tools/rhn-charsets b/backend/satellite_tools/rhn-charsets
index a6b33c7..44f6904 100755
--- a/backend/satellite_tools/rhn-charsets
+++ b/backend/satellite_tools/rhn-charsets
@@ -48,13 +48,7 @@ except KeyboardInterrupt:
def processCommandline():
""" process the commandline """
- try:
- from optparse import Option, OptionParser
- except ImportError:
- from optik import Option, OptionParser
- except KeyboardInterrupt:
- sys.stderr.write("\nUser interrupted process.\n")
- sys.exit(0)
+ from optparse import Option, OptionParser
optionsTable = [
Option('--db', action='store', type="string",
help='alternative database string (USERNAME/PASSWORD@SID). '+\
diff --git a/backend/satellite_tools/rhn-schema-version b/backend/satellite_tools/rhn-schema-version
index a757e5d..d482b6c 100755
--- a/backend/satellite_tools/rhn-schema-version
+++ b/backend/satellite_tools/rhn-schema-version
@@ -49,13 +49,7 @@ except KeyboardInterrupt:
def processCommandline():
""" process the commandline """
- try:
- from optparse import Option, OptionParser
- except ImportError:
- from optik import Option, OptionParser
- except KeyboardInterrupt:
- sys.stderr.write("\nUser interrupted process.\n")
- sys.exit(0)
+ from optparse import Option, OptionParser
optionsTable = [
Option('--db', action='store', type="string",
help='alternative database string (USERNAME/PASSWORD@SID). '+\
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index b416ac7..e8a7dbd 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -22,10 +22,7 @@ import socket
import jabber
import random
import string
-try:
- from optparse import OptionParser, Option
-except ImportError:
- from optik import OptionParser, Option
+from optparse import OptionParser, Option
import traceback
from cStringIO import StringIO
from rhn import SSL
diff --git a/client/tools/rhncfg/config_common/handler_base.py b/client/tools/rhncfg/config_common/handler_base.py
index cacd835..73e997c 100644
--- a/client/tools/rhncfg/config_common/handler_base.py
+++ b/client/tools/rhncfg/config_common/handler_base.py
@@ -44,8 +44,7 @@ class HandlerBase:
def _parse_args(self, args):
# Parses the arguments and returns a tuple (options, args)
- # For backwards compatibility with optik 1.3, pass usage: as well
- usage = string.join(["usage:", "%prog", self.mode, self._usage_options])
+ usage = string.join(["%prog", self.mode, self._usage_options])
self._parser = self._option_parser_class(
option_list=self._options_table,
usage=usage)
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index ce7d4b1..f9ad7e4 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -38,10 +38,7 @@ import urlparse
import rhnpush_confmanager
from rhn.connections import idn_ascii_to_pune
-try:
- from optparse import Option, OptionParser
-except ImportError:
- from optik import Option, OptionParser
+from optparse import Option, OptionParser
from rhn import rpclib
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index 0cb4dfa..266114a 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -34,10 +34,7 @@ import xmlrpclib
## lib imports
from rhn import rpclib, SSL
-try:
- from optparse import Option, OptionParser
-except ImportError:
- from optik import Option, OptionParser
+from optparse import Option, OptionParser
DEFAULT_WEBRPC_HANDLER_v3_x = '/rpc/api'
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 337e6d0..20a9cf8 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -38,10 +38,7 @@ import string
import shutil
from operator import truth
from rhnpush.uploadLib import UploadError, listChannel
-try:
- from optparse import Option, OptionParser
-except ImportError:
- from optik import Option, OptionParser
+from optparse import Option, OptionParser
# RHN imports
from spacewalk.common.rhnConfig import CFG, initCFG
commit 395d0afab63b34f63f113cc966000e22642a0602
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:52:57 2011 +0200
W: 23: Unused import urlsplit
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 9f0d51c..c734b20 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -20,7 +20,7 @@ import time
import string
import socket
import re
-from urlparse import urlsplit, urlparse, urlunparse
+from urlparse import urlparse, urlunparse
# common module imports
from rhn.UserDictCase import UserDictCase
commit a515d37f38e746f6adefd2d58c8416945b4948d0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:51:54 2011 +0200
remove unnecessary XXX - make pylint happy
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index cc83804..9f0d51c 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -179,12 +179,12 @@ class BrokerHandler(SharedHandler):
# if good token, cache it.
# 2. push into headers.
authToken = self.proxyAuth.check_cached_token()
- log_debug(5, 'XXX auth token for this machine only! %s' % authToken)
+ log_debug(5, 'Auth token for this machine only! %s' % authToken)
tokens = []
_oto = rhnFlags.get('outputTransportOptions')
if _oto.has_key('X-RHN-Proxy-Auth'):
- log_debug(5, 'XXX (auth token prior): %s'
+ log_debug(5, ' (auth token prior): %s'
% repr(_oto['X-RHN-Proxy-Auth']))
tokens = string.split(_oto['X-RHN-Proxy-Auth'], ',')
@@ -193,7 +193,7 @@ class BrokerHandler(SharedHandler):
tokens = filter(lambda token: token, tokens)
_oto['X-RHN-Proxy-Auth'] = string.join(tokens, ',')
- log_debug(5, 'XXX (auth token after): %s'
+ log_debug(5, ' (auth token after): %s'
% repr(_oto['X-RHN-Proxy-Auth']))
log_debug(3, 'Trying to connect to parent')
commit 0c04a3e3226545ed1faf2fdbd9096e9b45e40d32
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:46:40 2011 +0200
C: 19: Line too long (81/80)
diff --git a/proxy/proxy/rhnAuthCacheClient.py b/proxy/proxy/rhnAuthCacheClient.py
index 833b087..e45d1e6 100644
--- a/proxy/proxy/rhnAuthCacheClient.py
+++ b/proxy/proxy/rhnAuthCacheClient.py
@@ -16,7 +16,7 @@
# Red Hat trademarks are not licensed under GPLv2. No permission is
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
-##-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
# $Id: rhnAuthCacheClient.py,v 1.42 2004/09/20 15:21:25 misa Exp $
## language imports
@@ -99,7 +99,8 @@ class Shelf:
except CommunicationError:
wfile.close()
sock.close()
- Traceback("Shelf.__request", extra="Encountered a CommunicationError")
+ Traceback("Shelf.__request",
+ extra="Encountered a CommunicationError")
raise
except socket.error:
wfile.close()
commit 8eb97d2a06c907da3fb843e94038169753b432c1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:45:11 2011 +0200
C: 65: Line too long (89/80)
diff --git a/proxy/proxy/responseContext.py b/proxy/proxy/responseContext.py
index 439f068..be446d8 100644
--- a/proxy/proxy/responseContext.py
+++ b/proxy/proxy/responseContext.py
@@ -62,7 +62,9 @@ class ResponseContext:
self._getCurrentContext()[CXT_CONNECTION] = connection
def add(self):
- """ Add a new context to the stack. The new context becomes the current one. """
+ """ Add a new context to the stack. The new context becomes the current
+ one.
+ """
self._contextStack.append(self._createContext())
def remove(self):
commit 06562674f2bf2156337f091a2384eadc9f706870
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:42:12 2011 +0200
C: 24: Comma not followed by a space
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index c01e08a..747445b 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -21,8 +21,8 @@
import os
import base64
import xmlrpclib
-from rhnConstants import HEADER_ACTUAL_URI, HEADER_EFFECTIVE_URI,\
- HEADER_CHECKSUM, SCHEME_HTTP, SCHEME_HTTPS, URI_PREFIX_KS,\
+from rhnConstants import HEADER_ACTUAL_URI, HEADER_EFFECTIVE_URI, \
+ HEADER_CHECKSUM, SCHEME_HTTP, SCHEME_HTTPS, URI_PREFIX_KS, \
URI_PREFIX_KS_CHECKSUM, COMPONENT_BROKER, COMPONENT_REDIRECT
from rhn import rpclib, connections
commit b81fd2d279e3133da797a1f532d4bb9b8ac0ff5b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:41:09 2011 +0200
W: 31: Unused import initLOG
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 39c2be5..c01e08a 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -29,7 +29,7 @@ from rhn import rpclib, connections
## common imports
from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnConfig import CFG
-from spacewalk.common.rhnLog import initLOG, log_debug, log_error
+from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnApache import rhnApache
from spacewalk.common.rhnTB import Traceback
from spacewalk.common.rhnException import rhnFault, rhnException
commit c034056d704192291a3427c538324cc90d9bdc49
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:39:10 2011 +0200
C:380:apacheHandler.response_file: Comma not followed by a space
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 1bc9c77..39c2be5 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -378,9 +378,9 @@ class apacheHandler(rhnApache):
# find out the size of the file
if response.length == 0:
- response.file_obj.seek(0,2)
+ response.file_obj.seek(0, 2)
size = response.file_obj.tell()
- response.file_obj.seek(0,0)
+ response.file_obj.seek(0, 0)
else:
size = response.length
req.headers_out["Content-Length"] = str(size)
@@ -398,7 +398,7 @@ class apacheHandler(rhnApache):
req.headers_out["Accept-Ranges"] = "bytes"
req.headers_out["Content-Range"] = get_content_range(start, end, size)
size = end - start + 1
- response.file_obj.seek(start,0)
+ response.file_obj.seek(start, 0)
status = apache.HTTP_PARTIAL_CONTENT
else:
start = 0
commit 82e54b75dd3d8a87105f994b50fdff85f9aa6903
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:29:49 2011 +0200
W: 23: Uses of a deprecated module 'string'
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index f6d6b86..1bc9c77 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -20,7 +20,6 @@
## language imports
import os
import base64
-import string
import xmlrpclib
from rhnConstants import HEADER_ACTUAL_URI, HEADER_EFFECTIVE_URI,\
HEADER_CHECKSUM, SCHEME_HTTP, SCHEME_HTTPS, URI_PREFIX_KS,\
@@ -56,8 +55,8 @@ def getComponentType(req):
# pull server id out of "t:o:k:e:n:hostname1,t:o:k:e:n:hostname2,..."
proxy_auth = req.headers_in['X-RHN-Proxy-Auth']
- last_auth = string.split(proxy_auth, ',')[-1]
- last_visited = string.split(last_auth, ':')[0]
+ last_auth = proxy_auth.split(',')[-1]
+ last_visited = last_auth.split(':')[0]
proxy_server_id = get_proxy_auth().getProxyServerId()
# is it the same box?
try:
@@ -498,7 +497,7 @@ class apacheHandler(rhnApache):
output.process(response)
# Copy the rest of the fields
for k, v in output.headers.items():
- if string.lower(k) == 'content-type':
+ if k.lower() == 'content-type':
# Content-type
req.content_type = v
else:
@@ -528,10 +527,10 @@ class apacheHandler(rhnApache):
def _response_fault_get(self, req, response):
req.err_headers_out["X-RHN-Fault-Code"] = str(response.faultCode)
- faultString = string.strip(base64.encodestring(response.faultString))
+ faultString = base64.encodestring(response.faultString).strip()
# Split the faultString into multiple lines
- for line in string.split(faultString, '\n'):
- req.err_headers_out.add("X-RHN-Fault-String", string.strip(line))
+ for line in faultString.split('\n'):
+ req.err_headers_out.add("X-RHN-Fault-String", line.strip())
# And then send all the other things
for k, v in rhnFlags.get('outputTransportOptions').items():
setHeaderValue(req.err_headers_out, k, v)
commit 8bc47bc56d1ec64ecc0479e12441888ab79817f6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:25:33 2011 +0200
W: 25: Wildcard import rhnConstants
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 88faaa5..f6d6b86 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -22,7 +22,9 @@ import os
import base64
import string
import xmlrpclib
-from rhnConstants import *
+from rhnConstants import HEADER_ACTUAL_URI, HEADER_EFFECTIVE_URI,\
+ HEADER_CHECKSUM, SCHEME_HTTP, SCHEME_HTTPS, URI_PREFIX_KS,\
+ URI_PREFIX_KS_CHECKSUM, COMPONENT_BROKER, COMPONENT_REDIRECT
from rhn import rpclib, connections
## common imports
commit 8157cb7f44097f8fcf1d425fddc051954f848567
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:18:00 2011 +0200
W:505: Found indentation with tabs instead of spaces
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 0b40c70..88faaa5 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -502,7 +502,7 @@ class apacheHandler(rhnApache):
else:
setHeaderValue(req.headers_out, k, v)
- if CFG.DEBUG == 4:
+ if CFG.DEBUG == 4:
# I wrap this in an "if" so we don't parse a large file for no reason.
log_debug(4, "The response: %s[...SNIP (for sanity) SNIP...]%s" %
(response[:100], response[-100:]))
commit 7a775e485e9721e4748b91adbd9ce11ab5021ae9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 11 16:12:55 2011 +0200
shorten lines
C:200: Line too long (82/80)
C:251: Line too long (100/80)
C:398: Line too long (82/80)
C:467: Line too long (81/80)
C:484: Line too long (84/80)
C:507: Line too long (112/80)
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 39b617b..0b40c70 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -197,11 +197,11 @@ class apacheHandler(rhnApache):
return apache.OK
def _querySatelliteForChecksum(self, req):
- """ Sends a HEAD request to the satellite for the purpose of obtaining the
- checksum for the requested resource. A (status, checksum) tuple is
- returned. If status is not apache.OK, checksum will be None. If status
- is OK, and a checksum is not returned, the old BZ 158236 behavior will
- be used.
+ """ Sends a HEAD request to the satellite for the purpose of obtaining
+ the checksum for the requested resource. A (status, checksum)
+ tuple is returned. If status is not apache.OK, checksum will be
+ None. If status is OK, and a checksum is not returned, the old
+ BZ 158236 behavior will be used.
"""
scheme = SCHEME_HTTP
if req.server.port == 443:
@@ -504,7 +504,8 @@ class apacheHandler(rhnApache):
if CFG.DEBUG == 4:
# I wrap this in an "if" so we don't parse a large file for no reason.
- log_debug(4, "The response: %s[...SNIP (for sanity) SNIP...]%s" % (response[:100], response[-100:]))
+ log_debug(4, "The response: %s[...SNIP (for sanity) SNIP...]%s" %
+ (response[:100], response[-100:]))
elif CFG.DEBUG >= 5:
# if you absolutely must have that whole response in the log file
log_debug(5, "The response: %s" % response)
12 years, 9 months
Changes to 'refs/tags/spacewalk-web-1.5.15-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-11 14:01 +0000
Tagging package [spacewalk-web] version [1.5.15-1] in directory [web/].
Changes since spacewalk-setup-1.5.8-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.15-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 9 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 79da668e9e306352a303473ae1f821863f668fd7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 11 16:01:03 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.15-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3a85f2c..60cc943 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.14-1 web/
+1.5.15-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index d100b48..3b5370b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.14
+Version: 1.5.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jul 11 2011 Jan Pazdziora 1.5.15-1
+- Refactor RedHat.do to Vendor.do (jrenner(a)suse.de)
+
* Mon May 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
- made some queries PG compatible
- fixing ISE in errata cloning
12 years, 9 months
Changes to 'refs/tags/spacewalk-setup-1.5.8-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-07-11 14:00 +0000
Tagging package [spacewalk-setup] version [1.5.8-1] in directory [spacewalk/setup/].
Changes since spacewalk-koan-0.2.20-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.5.8-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 9 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 17bea0d62e278fa132c08854d13751dd9f823f2c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 11 16:00:39 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.8-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 8026f6f..f6cf0c8 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.7-1 spacewalk/setup/
+1.5.8-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 4ae4756..63ce4f0 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.7
+Version: 1.5.8
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Mon Jul 11 2011 Jan Pazdziora 1.5.8-1
+- Check for cases when loading of the DBD driver fails (so there is no DBI
+ error itself).
+
* Fri May 27 2011 Jan Pazdziora 1.5.7-1
- 708357 - If the mountpoint is on NFS, set cobbler_use_nfs.
12 years, 9 months