client/debian/apt-spacewalk/src/spacewalk | 9 ++++++---
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 473b5d6ab2220389d71bc9fb7910d1eb0cc72373
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 11:58:06 2011 +0200
The Debian client on x86_64 should send amd64-debian-linux
In the database we have only amd64 architecture not x86_64.
Addressing:
Error Message:
Architecture `x86_64-debian-linux' is not supported
Error Class Code: 24
Error Class Info: Unsupported server architecture.
Explanation:
An error has occurred while processing your request. If this problem
persists please enter a bug report at
bugzilla.redhat.com.
If you choose to submit the bug report, please be sure to include
details of what you were trying to do when this error occurred and
details on how to reproduce this problem.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
index be79efd..c89a116 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -86,6 +86,8 @@ def getArch():
# On debian we only support i386
if arch in ['i486', 'i586', 'i686']:
arch = 'i386'
+ if arch == 'x86_64':
+ arch = 'amd64'
arch += '-debian-linux'
return arch
commit 5e8a0e7729828b81c86b049bd49d120a4279cc80
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 28 11:45:21 2011 +0200
The method can be killed by the keyboard interrupt
Apt-get can terminate the acquire method by force. For the
Python code it means that KeyboardInterrupt is throw.
Addressing:
Traceback (most recent call last):
File /usr/lib/apt/methods/spacewalk, line 263, in <module>
ret = method.run()
File /usr/lib/apt/methods/spacewalk, line 90, in run
msg = self.__get_next_msg()
File /usr/lib/apt/methods/spacewalk, line 47, in __get_next_msg
line = sys.stdin.readline()
KeyboardInterrupt
Reading package lists... Done
diff --git a/client/debian/apt-spacewalk/src/spacewalk
b/client/debian/apt-spacewalk/src/spacewalk
index 3503995..02c0d97 100755
--- a/client/debian/apt-spacewalk/src/spacewalk
+++ b/client/debian/apt-spacewalk/src/spacewalk
@@ -259,6 +259,9 @@ class spacewalk_method(pkg_acquire_method):
if __name__ == '__main__':
- method = spacewalk_method()
- ret = method.run()
- sys.exit(ret)
+ try:
+ method = spacewalk_method()
+ ret = method.run()
+ sys.exit(ret)
+ except KeyboardInterrupt:
+ pass