Skip to content

Commit 851c45d

Browse files
author
Robert-André Mauchin
committed
Fix library location on 32 bits arch
Fix: #33 Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
1 parent d2e33fd commit 851c45d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

  • builtins
    • extractcode_libarchive_system_provided/src/extractcode_libarchive
    • typecode_libmagic_system_provided/src/typecode_libmagic

builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def get_locations(self):
4141

4242
if any(dist in debian_based_distro for dist in distribution):
4343
db_dir = '/usr/lib/file'
44-
lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
44+
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu'
4545

4646
elif any(dist in rpm_based_distro for dist in distribution):
4747
db_dir = '/usr/share/misc'
48-
lib_dir = '/usr/lib64'
48+
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
4949

5050
else:
5151
raise Exception('Unsupported system: {}'.format(distribution))

builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ def get_locations(self):
5555

5656
if any(dist in debian_based_distro for dist in distribution):
5757
db_dir = '/usr/lib/file'
58-
lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
58+
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu'
5959

6060
elif any(dist in rpm_based_distro for dist in distribution):
6161
db_dir = '/usr/share/misc'
62-
lib_dir = '/usr/lib64'
62+
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
6363

6464
else:
6565
raise Exception('Unsupported system: {}'.format(distribution))

0 commit comments

Comments
 (0)