[Pkg-privacy-commits] [torbrowser-launcher] 155/476: FIX#55: architecture detection on mixed systems

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit fc4426e3836de27c21f739ff854fc33cb7884a88
Author: boyska <piuttosto at logorroici.org>
Date:   Thu Sep 5 23:12:13 2013 +0200

    FIX#55: architecture detection on mixed systems
    
    that is, when running a 32bit system over a 64bit kernel; the previous
    behaviour was just detecting the kernel, aka "machine".
    It now detects userspace architecture using standard python libraries
---
 torbrowser-launcher | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 1c5553e..11a4a25 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -29,6 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 import sys
 sys.path.append('/usr/share/torbrowser-launcher/lib/')
+import platform
 
 import gettext
 gettext.install('torbrowser-launcher', '/usr/share/torbrowser-launcher/locale')
@@ -108,7 +109,7 @@ class TBLCommon:
     def discover_arch_lang(self):
         # figure out the architecture
         (sysname, nodename, release, version, machine) = os.uname()
-        self.architecture = machine
+        self.architecture = 'x86_64' if '64' in platform.architecture()[0] else 'i686'
 
         # figure out the language
         available_languages = ['en-US', 'ar', 'de', 'es-ES', 'fa', 'fr', 'it', 'ko', 'nl', 'pl', 'pt-PT', 'ru', 'vi', 'zh-CN']

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git