backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6f41af045beefca5126a039d301db9c5fb0965f2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 16:16:47 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.9.4-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index d269716..89ffc34 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.3
+Version: 0.9.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,7 +621,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
+* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.4-1
- fixed import error proxy ImportError: No module named server
- 246480 - sync last_modified column for rhnKickstartableTree as well.
- 501024 - want to preserve families for channels which are already in the dump
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 17f52ee..a93ec7e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.3-1 backend/
+0.9.4-1 backend/
13 years, 9 months
Changes to 'refs/tags/spacewalk-backend-0.8.47-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.47-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-22 15:08 +0000
Tagging package [spacewalk-backend] version [0.8.47-1] in directory [backend/].
Changes since spacewalk-schema-0.8.14-1:
Michael Mraka (4):
fixed proxy error: PythonCleanupHandler proxy.apacheServer::CleanupHandler: ImportError: No module named server
moved apache.py in spec
fixed Makefiles according to apache.py move
Automatic commit of package [spacewalk-backend] release [0.8.47-1].
---
backend/common/Makefile | 1
backend/common/apache.py | 68 ++++++++++
backend/common/rhnApache.py | 2
backend/satellite_exporter/satexport.py | 2
backend/server/Makefile | 2
backend/server/apache.py | 68 ----------
backend/server/apacheHandler.py | 2
backend/server/apacheRequest.py | 2
backend/server/apacheServer.py | 2
backend/server/apacheUploadServer.py | 2
backend/server/basePackageUpload.py | 2
backend/spacewalk-backend.spec | 7 -
backend/upload_server/handlers/package_push/package_push.py | 2
backend/upload_server/handlers/package_upload/package_upload.py | 2
rel-eng/packages/spacewalk-backend | 2
15 files changed, 85 insertions(+), 81 deletions(-)
---
13 years, 9 months
Branch 'SPACEWALK-0.8' - 4 commits - backend/common backend/satellite_exporter backend/server backend/spacewalk-backend.spec backend/upload_server rel-eng/packages
by Michael Mraka
backend/common/Makefile | 1
backend/common/apache.py | 68 ++++++++++
backend/common/rhnApache.py | 2
backend/satellite_exporter/satexport.py | 2
backend/server/Makefile | 2
backend/server/apache.py | 68 ----------
backend/server/apacheHandler.py | 2
backend/server/apacheRequest.py | 2
backend/server/apacheServer.py | 2
backend/server/apacheUploadServer.py | 2
backend/server/basePackageUpload.py | 2
backend/spacewalk-backend.spec | 7 -
backend/upload_server/handlers/package_push/package_push.py | 2
backend/upload_server/handlers/package_upload/package_upload.py | 2
rel-eng/packages/spacewalk-backend | 2
15 files changed, 85 insertions(+), 81 deletions(-)
New commits:
commit fe1f3747faa880b654beee2ebea2a56166e2c6d9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 16:08:18 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.47-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6006490..888d29b 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.8.46
+Version: 0.8.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,6 +621,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.47-1
+- fixed proxy issue caused by move to mod_wsgi
+
* Wed Feb 17 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 0.8.46-1
- update-packages: log every processed package
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 944da96..ea06d9d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.46-1 backend/
+0.8.47-1 backend/
commit 1299f53b5e93887207f4f41a2088e2eb923350d1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 15:37:39 2010 +0100
fixed Makefiles according to apache.py move
diff --git a/backend/common/Makefile b/backend/common/Makefile
index 3294f5b..a82b39b 100644
--- a/backend/common/Makefile
+++ b/backend/common/Makefile
@@ -8,6 +8,7 @@ TOP = ..
# Specific stuff
SUBDIR = common
FILES = __init__ \
+ apache \
rhn_posix \
rhn_timer \
rhnApache \
diff --git a/backend/server/Makefile b/backend/server/Makefile
index 3b74982..75166dd 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -9,7 +9,7 @@ TOP = ..
SUBDIR = server
FILES = __init__ \
apacheServer apacheHandler apacheAuth apacheRequest \
- apache apacheUploadServer \
+ apacheUploadServer \
byterange \
configFilesHandler \
rhnAuthPAM rhnCapability rhnChannel rhnDatabaseCache \
commit 7a474c7b428d2e7cbcdd13a4886ea610a62002d8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:54:26 2010 +0100
moved apache.py in spec
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3dcf188..6006490 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -301,6 +301,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}
%dir %{rhnroot}/common
%{rhnroot}/common/__init__.py*
+%{rhnroot}/common/apache.py*
%{rhnroot}/common/rhn_posix.py*
%{rhnroot}/common/rhn_timer.py*
%{rhnroot}/common/rhnApache.py*
@@ -334,7 +335,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%files server
%defattr(-,root,root)
# modules
-%{rhnroot}/server/apache.py*
%{rhnroot}/server/apacheAuth.py*
%{rhnroot}/server/apacheHandler.py*
%{rhnroot}/server/apacheRequest.py*
commit da671cc699b4a8fa48879f6b51d3df64be73548c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:41:36 2010 +0100
fixed proxy error: PythonCleanupHandler proxy.apacheServer::CleanupHandler: ImportError: No module named server
moved apache.py to common so rhnApache.py on proxy can see it
diff --git a/backend/common/apache.py b/backend/common/apache.py
new file mode 100644
index 0000000..79b687f
--- /dev/null
+++ b/backend/common/apache.py
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2010 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# 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.
+#
+#
+
+# constants meant to match the apache.py module of mod_python
+
+HTTP_CONTINUE = 100
+HTTP_SWITCHING_PROTOCOLS = 101
+HTTP_PROCESSING = 102
+HTTP_OK = 200
+HTTP_CREATED = 201
+HTTP_ACCEPTED = 202
+HTTP_NON_AUTHORITATIVE = 203
+HTTP_NO_CONTENT = 204
+HTTP_RESET_CONTENT = 205
+HTTP_PARTIAL_CONTENT = 206
+HTTP_MULTI_STATUS = 207
+HTTP_MULTIPLE_CHOICES = 300
+HTTP_MOVED_PERMANENTLY = 301
+HTTP_MOVED_TEMPORARILY = 302
+HTTP_SEE_OTHER = 303
+HTTP_NOT_MODIFIED = 304
+HTTP_USE_PROXY = 305
+HTTP_TEMPORARY_REDIRECT = 307
+HTTP_BAD_REQUEST = 400
+HTTP_UNAUTHORIZED = 401
+HTTP_PAYMENT_REQUIRED = 402
+HTTP_FORBIDDEN = 403
+HTTP_NOT_FOUND = 404
+HTTP_METHOD_NOT_ALLOWED = 405
+HTTP_NOT_ACCEPTABLE = 406
+HTTP_PROXY_AUTHENTICATION_REQUIRED= 407
+HTTP_REQUEST_TIME_OUT = 408
+HTTP_CONFLICT = 409
+HTTP_GONE = 410
+HTTP_LENGTH_REQUIRED = 411
+HTTP_PRECONDITION_FAILED = 412
+HTTP_REQUEST_ENTITY_TOO_LARGE = 413
+HTTP_REQUEST_URI_TOO_LARGE = 414
+HTTP_UNSUPPORTED_MEDIA_TYPE = 415
+HTTP_RANGE_NOT_SATISFIABLE = 416
+HTTP_EXPECTATION_FAILED = 417
+HTTP_UNPROCESSABLE_ENTITY = 422
+HTTP_LOCKED = 423
+HTTP_FAILED_DEPENDENCY = 424
+HTTP_INTERNAL_SERVER_ERROR = 500
+HTTP_NOT_IMPLEMENTED = 501
+HTTP_BAD_GATEWAY = 502
+HTTP_SERVICE_UNAVAILABLE = 503
+HTTP_GATEWAY_TIME_OUT = 504
+HTTP_VERSION_NOT_SUPPORTED = 505
+HTTP_VARIANT_ALSO_VARIES = 506
+HTTP_INSUFFICIENT_STORAGE = 507
+HTTP_NOT_EXTENDED = 510
+REMOTE_DOUBLE_REV = 3
+OK = REQ_PROCEED = 0
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index 1c1314d..90196fe 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -23,7 +23,7 @@ import os.path
# global module imports
-from server import apache
+from common import apache
# Now local module imports
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 84490c0..84957ce 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -17,7 +17,7 @@
import time
import xmlrpclib
-from server import apache
+from common import apache
from common import CFG, initCFG, log_debug, log_error, log_setreq, initLOG, \
Traceback, rhnFault, rhnException, rhnFlags
diff --git a/backend/server/apache.py b/backend/server/apache.py
deleted file mode 100644
index 79b687f..0000000
--- a/backend/server/apache.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# 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.
-#
-#
-
-# constants meant to match the apache.py module of mod_python
-
-HTTP_CONTINUE = 100
-HTTP_SWITCHING_PROTOCOLS = 101
-HTTP_PROCESSING = 102
-HTTP_OK = 200
-HTTP_CREATED = 201
-HTTP_ACCEPTED = 202
-HTTP_NON_AUTHORITATIVE = 203
-HTTP_NO_CONTENT = 204
-HTTP_RESET_CONTENT = 205
-HTTP_PARTIAL_CONTENT = 206
-HTTP_MULTI_STATUS = 207
-HTTP_MULTIPLE_CHOICES = 300
-HTTP_MOVED_PERMANENTLY = 301
-HTTP_MOVED_TEMPORARILY = 302
-HTTP_SEE_OTHER = 303
-HTTP_NOT_MODIFIED = 304
-HTTP_USE_PROXY = 305
-HTTP_TEMPORARY_REDIRECT = 307
-HTTP_BAD_REQUEST = 400
-HTTP_UNAUTHORIZED = 401
-HTTP_PAYMENT_REQUIRED = 402
-HTTP_FORBIDDEN = 403
-HTTP_NOT_FOUND = 404
-HTTP_METHOD_NOT_ALLOWED = 405
-HTTP_NOT_ACCEPTABLE = 406
-HTTP_PROXY_AUTHENTICATION_REQUIRED= 407
-HTTP_REQUEST_TIME_OUT = 408
-HTTP_CONFLICT = 409
-HTTP_GONE = 410
-HTTP_LENGTH_REQUIRED = 411
-HTTP_PRECONDITION_FAILED = 412
-HTTP_REQUEST_ENTITY_TOO_LARGE = 413
-HTTP_REQUEST_URI_TOO_LARGE = 414
-HTTP_UNSUPPORTED_MEDIA_TYPE = 415
-HTTP_RANGE_NOT_SATISFIABLE = 416
-HTTP_EXPECTATION_FAILED = 417
-HTTP_UNPROCESSABLE_ENTITY = 422
-HTTP_LOCKED = 423
-HTTP_FAILED_DEPENDENCY = 424
-HTTP_INTERNAL_SERVER_ERROR = 500
-HTTP_NOT_IMPLEMENTED = 501
-HTTP_BAD_GATEWAY = 502
-HTTP_SERVICE_UNAVAILABLE = 503
-HTTP_GATEWAY_TIME_OUT = 504
-HTTP_VERSION_NOT_SUPPORTED = 505
-HTTP_VARIANT_ALSO_VARIES = 506
-HTTP_INSUFFICIENT_STORAGE = 507
-HTTP_NOT_EXTENDED = 510
-REMOTE_DOUBLE_REV = 3
-OK = REQ_PROCEED = 0
diff --git a/backend/server/apacheHandler.py b/backend/server/apacheHandler.py
index 9e6378e..f4e8c2a 100644
--- a/backend/server/apacheHandler.py
+++ b/backend/server/apacheHandler.py
@@ -18,7 +18,7 @@ import time
import string
# global module imports
-from server import apache
+from common import apache
# common module imports
from common import rhnApache, rhnTB
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index 91585eb..b54fe6b 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -21,7 +21,7 @@ import base64
import string
from rhn import rpclib
from rhn.rpclib import transports
-from server import apache
+from common import apache
# common modules
from common import CFG, rhnFault, rhnFlags, redirectException #to catch redirect exception
diff --git a/backend/server/apacheServer.py b/backend/server/apacheServer.py
index d3e06ef..3d65719 100644
--- a/backend/server/apacheServer.py
+++ b/backend/server/apacheServer.py
@@ -14,7 +14,7 @@
#
# global module imports
-from server import apache
+from common import apache
# common module imports
from common import CFG, initCFG, log_setreq, initLOG, Traceback
diff --git a/backend/server/apacheUploadServer.py b/backend/server/apacheUploadServer.py
index e5e10fb..fd8acf7 100644
--- a/backend/server/apacheUploadServer.py
+++ b/backend/server/apacheUploadServer.py
@@ -16,7 +16,7 @@
#
import string
-from server import apache
+from common import apache
import rhnSession
diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py
index ae5a705..c7e4237 100644
--- a/backend/server/basePackageUpload.py
+++ b/backend/server/basePackageUpload.py
@@ -17,7 +17,7 @@
import os
import tempfile
-from server import apache
+from common import apache
from common import log_debug, rhnFault, UserDictCase
diff --git a/backend/upload_server/handlers/package_push/package_push.py b/backend/upload_server/handlers/package_push/package_push.py
index 9dbecb9..07e265a 100644
--- a/backend/upload_server/handlers/package_push/package_push.py
+++ b/backend/upload_server/handlers/package_push/package_push.py
@@ -22,7 +22,7 @@
import os
import base64
import string
-from server import apache
+from common import apache
from rhn import rpclib
from common import CFG, log_debug, log_error, rhnFault, rhnFlags
diff --git a/backend/upload_server/handlers/package_upload/package_upload.py b/backend/upload_server/handlers/package_upload/package_upload.py
index a87e68f..8736c64 100644
--- a/backend/upload_server/handlers/package_upload/package_upload.py
+++ b/backend/upload_server/handlers/package_upload/package_upload.py
@@ -20,7 +20,7 @@
# $Id$
import os
-from server import apache
+from common import apache
from common import CFG, log_debug, log_error, rhnFault, rhnFlags
from server import rhnPackageUpload, basePackageUpload
13 years, 9 months
backend/common backend/server
by Michael Mraka
backend/common/Makefile | 1 +
backend/server/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 658d101bb73226390974f4d9f33433e4aea86554
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 15:37:39 2010 +0100
fixed Makefiles according to apache.py move
diff --git a/backend/common/Makefile b/backend/common/Makefile
index 3294f5b..a82b39b 100644
--- a/backend/common/Makefile
+++ b/backend/common/Makefile
@@ -8,6 +8,7 @@ TOP = ..
# Specific stuff
SUBDIR = common
FILES = __init__ \
+ apache \
rhn_posix \
rhn_timer \
rhnApache \
diff --git a/backend/server/Makefile b/backend/server/Makefile
index 3b74982..75166dd 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -9,7 +9,7 @@ TOP = ..
SUBDIR = server
FILES = __init__ \
apacheServer apacheHandler apacheAuth apacheRequest \
- apache apacheUploadServer \
+ apacheUploadServer \
byterange \
configFilesHandler \
rhnAuthPAM rhnCapability rhnChannel rhnDatabaseCache \
13 years, 9 months
Changes to 'refs/tags/spacewalk-utils-0.9.4-1'
by Michael Mraka
Tag 'spacewalk-utils-0.9.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-22 14:16 +0000
Tagging package [spacewalk-utils] version [0.9.4-1] in directory [utils/].
Changes since spacewalk-backend-0.9.3-1:
Michael Mraka (2):
emulate epilog in optparse on RHEL5 (python 2.4)
Automatic commit of package [spacewalk-utils] release [0.9.4-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-common-channels | 12 +++++++-----
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 12 insertions(+), 7 deletions(-)
---
13 years, 9 months
2 commits - rel-eng/packages utils/spacewalk-common-channels utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-common-channels | 12 +++++++-----
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 3b76a22301c9ddb7e147e36a7fce4be555809c9a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 15:16:28 2010 +0100
Automatic commit of package [spacewalk-utils] release [0.9.4-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 4f6b2df..e2c6753 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-0.9.3-1 utils/
+0.9.4-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 4bc807b..8b6bce7 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 0.9.3
+Version: 0.9.4
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.4-1
+- emulate epilog in optparse on RHEL5 (python 2.4)
+
* Wed Feb 17 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
- fixed of spacewalk-common-channels
commit 091a71cb0d96761c570b1249f9362bddd858de1f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 15:14:30 2010 +0100
emulate epilog in optparse on RHEL5 (python 2.4)
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 8b55880..2f3f64b 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -47,10 +47,11 @@ channel_arch = {
SPLIT_PATTERN = '[ ,]+'
-# extend OptionParser not to reformat epilog
+# extend OptionParser to print examples
class xOptionParser(OptionParser):
- def format_epilog(self, formatter):
- return "\n\n" + self.epilog
+ def print_help(self):
+ OptionParser.print_help(self)
+ print "\n\n" + self.examples
def connect(user, password, server):
server_url = "http://%s/rpc/api" % server
@@ -97,7 +98,7 @@ def add_channels(channels, section, arch):
if __name__ == "__main__":
# options parsing
usage = "usage: %prog [options] <channel1 glob> [<channel2 glob> ... ]"
- epilog = """Examples:
+ examples = """Examples:
Create Fedora 12 channel, its child channels and activation key limited to 10 servers:
%(prog)s -u admin -p pass -k 10 'fedora12*'
@@ -131,7 +132,8 @@ Create everything as well as unlimited activation key for every channel:
action="store_true"),
]
- parser = xOptionParser(usage=usage, epilog=epilog, option_list=option_list)
+ parser = xOptionParser(usage=usage, option_list=option_list)
+ parser.examples = examples
(options, args) = parser.parse_args()
config = ConfigParser.ConfigParser()
config.read(options.config)
13 years, 9 months
Changes to 'refs/tags/spacewalk-backend-0.9.3-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-22 13:56 +0000
Tagging package [spacewalk-backend] version [0.9.3-1] in directory [backend/].
Changes since spacewalk-backend-0.9.2-1:
Michael Mraka (2):
moved apache.py in spec
Automatic commit of package [spacewalk-backend] release [0.9.3-1].
---
backend/spacewalk-backend.spec | 6 +++---
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
13 years, 9 months
2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++---
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9bc7e1b28c0a3704e899e7b753f349a2696aab5c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:56:51 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.9.3-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 09e5fbf..d269716 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.2
+Version: 0.9.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,7 +621,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
- fixed import error proxy ImportError: No module named server
- 246480 - sync last_modified column for rhnKickstartableTree as well.
- 501024 - want to preserve families for channels which are already in the dump
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ac6d85c..17f52ee 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.2-1 backend/
+0.9.3-1 backend/
commit 3b3e611936c33720977f59b77e8c97cc9b119306
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:54:26 2010 +0100
moved apache.py in spec
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 640a72d..09e5fbf 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -301,6 +301,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}
%dir %{rhnroot}/common
%{rhnroot}/common/__init__.py*
+%{rhnroot}/common/apache.py*
%{rhnroot}/common/rhn_posix.py*
%{rhnroot}/common/rhn_timer.py*
%{rhnroot}/common/rhnApache.py*
@@ -334,7 +335,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%files server
%defattr(-,root,root)
# modules
-%{rhnroot}/server/apache.py*
%{rhnroot}/server/apacheAuth.py*
%{rhnroot}/server/apacheHandler.py*
%{rhnroot}/server/apacheRequest.py*
13 years, 9 months
Changes to 'refs/tags/spacewalk-backend-0.9.2-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-02-22 13:45 +0000
Tagging package [spacewalk-backend] version [0.9.2-1] in directory [backend/].
Changes since osad-5.9.30-1:
Michael Mraka (2):
fixed proxy error: PythonCleanupHandler proxy.apacheServer::CleanupHandler: ImportError: No module named server
Automatic commit of package [spacewalk-backend] release [0.9.2-1].
---
backend/common/apache.py | 68 ++++++++++
backend/common/rhnApache.py | 2
backend/satellite_exporter/satexport.py | 2
backend/server/apache.py | 68 ----------
backend/server/apacheHandler.py | 2
backend/server/apacheRequest.py | 2
backend/server/apacheServer.py | 2
backend/server/apacheUploadServer.py | 2
backend/server/basePackageUpload.py | 2
backend/spacewalk-backend.spec | 7 -
backend/upload_server/handlers/package_push/package_push.py | 2
backend/upload_server/handlers/package_upload/package_upload.py | 2
rel-eng/packages/spacewalk-backend | 2
13 files changed, 84 insertions(+), 79 deletions(-)
---
13 years, 9 months
2 commits - backend/common backend/satellite_exporter backend/server backend/spacewalk-backend.spec backend/upload_server rel-eng/packages
by Michael Mraka
backend/common/apache.py | 68 ++++++++++
backend/common/rhnApache.py | 2
backend/satellite_exporter/satexport.py | 2
backend/server/apache.py | 68 ----------
backend/server/apacheHandler.py | 2
backend/server/apacheRequest.py | 2
backend/server/apacheServer.py | 2
backend/server/apacheUploadServer.py | 2
backend/server/basePackageUpload.py | 2
backend/spacewalk-backend.spec | 7 -
backend/upload_server/handlers/package_push/package_push.py | 2
backend/upload_server/handlers/package_upload/package_upload.py | 2
rel-eng/packages/spacewalk-backend | 2
13 files changed, 84 insertions(+), 79 deletions(-)
New commits:
commit 11381f32b6474774f5b9d8fa01b3f26679440f79
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:45:36 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.9.2-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 172af52..640a72d 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.1
+Version: 0.9.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,6 +621,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+- fixed import error proxy ImportError: No module named server
+- 246480 - sync last_modified column for rhnKickstartableTree as well.
+- 501024 - want to preserve families for channels which are already in the dump
+
* Fri Feb 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1
- added repo deletion to channel remove script
- added spacewalk-remove-channel
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 848b835..ac6d85c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.1-1 backend/
+0.9.2-1 backend/
commit d9e271075e6e8e84c2a60f551c9aad6ce65278d0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 22 14:41:36 2010 +0100
fixed proxy error: PythonCleanupHandler proxy.apacheServer::CleanupHandler: ImportError: No module named server
moved apache.py to common so rhnApache.py on proxy can see it
diff --git a/backend/common/apache.py b/backend/common/apache.py
new file mode 100644
index 0000000..79b687f
--- /dev/null
+++ b/backend/common/apache.py
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2010 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# 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.
+#
+#
+
+# constants meant to match the apache.py module of mod_python
+
+HTTP_CONTINUE = 100
+HTTP_SWITCHING_PROTOCOLS = 101
+HTTP_PROCESSING = 102
+HTTP_OK = 200
+HTTP_CREATED = 201
+HTTP_ACCEPTED = 202
+HTTP_NON_AUTHORITATIVE = 203
+HTTP_NO_CONTENT = 204
+HTTP_RESET_CONTENT = 205
+HTTP_PARTIAL_CONTENT = 206
+HTTP_MULTI_STATUS = 207
+HTTP_MULTIPLE_CHOICES = 300
+HTTP_MOVED_PERMANENTLY = 301
+HTTP_MOVED_TEMPORARILY = 302
+HTTP_SEE_OTHER = 303
+HTTP_NOT_MODIFIED = 304
+HTTP_USE_PROXY = 305
+HTTP_TEMPORARY_REDIRECT = 307
+HTTP_BAD_REQUEST = 400
+HTTP_UNAUTHORIZED = 401
+HTTP_PAYMENT_REQUIRED = 402
+HTTP_FORBIDDEN = 403
+HTTP_NOT_FOUND = 404
+HTTP_METHOD_NOT_ALLOWED = 405
+HTTP_NOT_ACCEPTABLE = 406
+HTTP_PROXY_AUTHENTICATION_REQUIRED= 407
+HTTP_REQUEST_TIME_OUT = 408
+HTTP_CONFLICT = 409
+HTTP_GONE = 410
+HTTP_LENGTH_REQUIRED = 411
+HTTP_PRECONDITION_FAILED = 412
+HTTP_REQUEST_ENTITY_TOO_LARGE = 413
+HTTP_REQUEST_URI_TOO_LARGE = 414
+HTTP_UNSUPPORTED_MEDIA_TYPE = 415
+HTTP_RANGE_NOT_SATISFIABLE = 416
+HTTP_EXPECTATION_FAILED = 417
+HTTP_UNPROCESSABLE_ENTITY = 422
+HTTP_LOCKED = 423
+HTTP_FAILED_DEPENDENCY = 424
+HTTP_INTERNAL_SERVER_ERROR = 500
+HTTP_NOT_IMPLEMENTED = 501
+HTTP_BAD_GATEWAY = 502
+HTTP_SERVICE_UNAVAILABLE = 503
+HTTP_GATEWAY_TIME_OUT = 504
+HTTP_VERSION_NOT_SUPPORTED = 505
+HTTP_VARIANT_ALSO_VARIES = 506
+HTTP_INSUFFICIENT_STORAGE = 507
+HTTP_NOT_EXTENDED = 510
+REMOTE_DOUBLE_REV = 3
+OK = REQ_PROCEED = 0
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index 1c1314d..90196fe 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -23,7 +23,7 @@ import os.path
# global module imports
-from server import apache
+from common import apache
# Now local module imports
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 84490c0..84957ce 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -17,7 +17,7 @@
import time
import xmlrpclib
-from server import apache
+from common import apache
from common import CFG, initCFG, log_debug, log_error, log_setreq, initLOG, \
Traceback, rhnFault, rhnException, rhnFlags
diff --git a/backend/server/apache.py b/backend/server/apache.py
deleted file mode 100644
index 79b687f..0000000
--- a/backend/server/apache.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# 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.
-#
-#
-
-# constants meant to match the apache.py module of mod_python
-
-HTTP_CONTINUE = 100
-HTTP_SWITCHING_PROTOCOLS = 101
-HTTP_PROCESSING = 102
-HTTP_OK = 200
-HTTP_CREATED = 201
-HTTP_ACCEPTED = 202
-HTTP_NON_AUTHORITATIVE = 203
-HTTP_NO_CONTENT = 204
-HTTP_RESET_CONTENT = 205
-HTTP_PARTIAL_CONTENT = 206
-HTTP_MULTI_STATUS = 207
-HTTP_MULTIPLE_CHOICES = 300
-HTTP_MOVED_PERMANENTLY = 301
-HTTP_MOVED_TEMPORARILY = 302
-HTTP_SEE_OTHER = 303
-HTTP_NOT_MODIFIED = 304
-HTTP_USE_PROXY = 305
-HTTP_TEMPORARY_REDIRECT = 307
-HTTP_BAD_REQUEST = 400
-HTTP_UNAUTHORIZED = 401
-HTTP_PAYMENT_REQUIRED = 402
-HTTP_FORBIDDEN = 403
-HTTP_NOT_FOUND = 404
-HTTP_METHOD_NOT_ALLOWED = 405
-HTTP_NOT_ACCEPTABLE = 406
-HTTP_PROXY_AUTHENTICATION_REQUIRED= 407
-HTTP_REQUEST_TIME_OUT = 408
-HTTP_CONFLICT = 409
-HTTP_GONE = 410
-HTTP_LENGTH_REQUIRED = 411
-HTTP_PRECONDITION_FAILED = 412
-HTTP_REQUEST_ENTITY_TOO_LARGE = 413
-HTTP_REQUEST_URI_TOO_LARGE = 414
-HTTP_UNSUPPORTED_MEDIA_TYPE = 415
-HTTP_RANGE_NOT_SATISFIABLE = 416
-HTTP_EXPECTATION_FAILED = 417
-HTTP_UNPROCESSABLE_ENTITY = 422
-HTTP_LOCKED = 423
-HTTP_FAILED_DEPENDENCY = 424
-HTTP_INTERNAL_SERVER_ERROR = 500
-HTTP_NOT_IMPLEMENTED = 501
-HTTP_BAD_GATEWAY = 502
-HTTP_SERVICE_UNAVAILABLE = 503
-HTTP_GATEWAY_TIME_OUT = 504
-HTTP_VERSION_NOT_SUPPORTED = 505
-HTTP_VARIANT_ALSO_VARIES = 506
-HTTP_INSUFFICIENT_STORAGE = 507
-HTTP_NOT_EXTENDED = 510
-REMOTE_DOUBLE_REV = 3
-OK = REQ_PROCEED = 0
diff --git a/backend/server/apacheHandler.py b/backend/server/apacheHandler.py
index 9e6378e..f4e8c2a 100644
--- a/backend/server/apacheHandler.py
+++ b/backend/server/apacheHandler.py
@@ -18,7 +18,7 @@ import time
import string
# global module imports
-from server import apache
+from common import apache
# common module imports
from common import rhnApache, rhnTB
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index 91585eb..b54fe6b 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -21,7 +21,7 @@ import base64
import string
from rhn import rpclib
from rhn.rpclib import transports
-from server import apache
+from common import apache
# common modules
from common import CFG, rhnFault, rhnFlags, redirectException #to catch redirect exception
diff --git a/backend/server/apacheServer.py b/backend/server/apacheServer.py
index d3e06ef..3d65719 100644
--- a/backend/server/apacheServer.py
+++ b/backend/server/apacheServer.py
@@ -14,7 +14,7 @@
#
# global module imports
-from server import apache
+from common import apache
# common module imports
from common import CFG, initCFG, log_setreq, initLOG, Traceback
diff --git a/backend/server/apacheUploadServer.py b/backend/server/apacheUploadServer.py
index e5e10fb..fd8acf7 100644
--- a/backend/server/apacheUploadServer.py
+++ b/backend/server/apacheUploadServer.py
@@ -16,7 +16,7 @@
#
import string
-from server import apache
+from common import apache
import rhnSession
diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py
index ae5a705..c7e4237 100644
--- a/backend/server/basePackageUpload.py
+++ b/backend/server/basePackageUpload.py
@@ -17,7 +17,7 @@
import os
import tempfile
-from server import apache
+from common import apache
from common import log_debug, rhnFault, UserDictCase
diff --git a/backend/upload_server/handlers/package_push/package_push.py b/backend/upload_server/handlers/package_push/package_push.py
index 9dbecb9..07e265a 100644
--- a/backend/upload_server/handlers/package_push/package_push.py
+++ b/backend/upload_server/handlers/package_push/package_push.py
@@ -22,7 +22,7 @@
import os
import base64
import string
-from server import apache
+from common import apache
from rhn import rpclib
from common import CFG, log_debug, log_error, rhnFault, rhnFlags
diff --git a/backend/upload_server/handlers/package_upload/package_upload.py b/backend/upload_server/handlers/package_upload/package_upload.py
index a87e68f..8736c64 100644
--- a/backend/upload_server/handlers/package_upload/package_upload.py
+++ b/backend/upload_server/handlers/package_upload/package_upload.py
@@ -20,7 +20,7 @@
# $Id$
import os
-from server import apache
+from common import apache
from common import CFG, log_debug, log_error, rhnFault, rhnFlags
from server import rhnPackageUpload, basePackageUpload
13 years, 9 months