summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-08-13 02:10:01 -0400
committerMartin Kosek <mkosek@redhat.com>2013-08-13 15:31:46 +0200
commitb9ec4d1a679f1485c9c109969e891269627d9f7f (patch)
treecf197642059f6fae5a9b99ab170d2b8546d97af2 /ipaserver
parentb561e85e4a7ae9f39a10951ed3cc5e2cc114edb2 (diff)
downloadfreeipa-b9ec4d1a679f1485c9c109969e891269627d9f7f.tar.gz
freeipa-b9ec4d1a679f1485c9c109969e891269627d9f7f.tar.xz
freeipa-b9ec4d1a679f1485c9c109969e891269627d9f7f.zip
Prevent *.pyo and *.pyc multilib problems
Differences in the python byte code fails in a build validation (rpmdiff) done on difference architecture of the same package. This patch: 1) Ensures that timestamps of generated *.pyo and *.pyc files match 2) Python integer literals greater or equal 2^32 and lower than 2^64 are converted to long right away to prevent different type of the integer on architectures with different size of int https://fedorahosted.org/freeipa/ticket/3858
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/certs.py2
-rw-r--r--ipaserver/install/ipa_backup.py2
-rw-r--r--ipaserver/install/ipa_restore.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py
index 6d01d2be1..8d7b7d0d3 100644
--- a/ipaserver/install/certs.py
+++ b/ipaserver/install/certs.py
@@ -540,7 +540,7 @@ class CertDB(object):
/usr/lib[64]/ipa/certmonger.
"""
if command is not None and not os.path.isabs(command):
- if sys.maxsize > 2**32:
+ if sys.maxsize > 2**32L:
libpath = 'lib64'
else:
libpath = 'lib'
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index 54694c99d..8326bb0c6 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -561,7 +561,7 @@ class Backup(admintool.AdminTool):
if instance != 'PKI-IPA':
return os.path.join('/var/lib/dirsrv', 'scripts-%s' % instance)
else:
- if sys.maxsize > 2**32:
+ if sys.maxsize > 2**32L:
libpath = 'lib64'
else:
libpath = 'lib'
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 760da0baf..35cc6a518 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -593,7 +593,7 @@ class Restore(admintool.AdminTool):
if instance != 'PKI-IPA':
return os.path.join('/var/lib/dirsrv', 'scripts-%s' % instance)
else:
- if sys.maxsize > 2**32:
+ if sys.maxsize > 2**32L:
libpath = 'lib64'
else:
libpath = 'lib'