[Libreoffice-commits] core.git: nss/nsinstall.py

Julien Nabet serval2412 at yahoo.fr
Wed Mar 27 10:58:17 PDT 2013


 nss/nsinstall.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 239fb4cb41cb0d1ed42bf5cf8ecdabdca4a28a68
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 27 18:54:52 2013 +0100

    Try to fix python problems
    
    "Octal literals are no longer of the form 0720; use 0o720 instead."
    See http://docs.python.org/3.0/whatsnew/3.0.html
    Seems ok with Python < 3
    
    Change-Id: I588a9dcc4f4b447d5cb88eb6bb03ab2d598dc9f0

diff --git a/nss/nsinstall.py b/nss/nsinstall.py
index 7be4197..31b3de3 100644
--- a/nss/nsinstall.py
+++ b/nss/nsinstall.py
@@ -89,8 +89,8 @@ def nsinstall(argv):
       options.m = int(options.m, 8)
       # I have no idea why nss insists on using this mode for installed headers.
       # It causes problems with updating the files during a rebuild.
-      if options.m == 0444:
-        options.m = 0644
+      if options.m == 0o444:
+        options.m = 0o644
     except:
       sys.stderr.write('nsinstall: ' + options.m + ' is not a valid mode\n')
       return 1
@@ -147,7 +147,7 @@ def nsinstall(argv):
         shutil.copy2(srcpath, targetpath)
       else:
         if os.path.exists(targetpath):
-          os.chmod(targetpath, 0755)
+          os.chmod(targetpath, 0o755)
           os.remove(targetpath)
         shutil.copy(srcpath, targetpath)
 


More information about the Libreoffice-commits mailing list