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

[Tor Lillqvist]

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

New commits:
commit 4549f76d32c9ad278f5b22fc03feb5b8d041080a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Feb 6 15:28:43 2013 +0200

    Revert "Don't bother with chmod() on Windows"
    
    Argh, seems that it wasn't necessary after all.
    
    This reverts commit 5bf437cd67d5fe2e4353069969cd99cc48e65730.

diff --git a/nss/nsinstall.py b/nss/nsinstall.py
index 9e306cf..e1728a9 100644
--- a/nss/nsinstall.py
+++ b/nss/nsinstall.py
@@ -103,7 +103,7 @@ def nsinstall(argv):
       if not os.path.isdir(args[0]):
         sys.stderr.write('nsinstall: ' + args[0] + ' is not a directory\n')
         sys.exit(1)
-      if os.name != 'nt' and options.m:
+      if options.m:
         os.chmod(args[0], options.m)
       sys.exit()
     if options.m:
@@ -121,7 +121,7 @@ def nsinstall(argv):
       dest = os.path.join(target,
                           os.path.basename(os.path.normpath(e)))
       handleTarget(e, dest)
-      if os.name != 'nt' and options.m:
+      if options.m:
         os.chmod(dest, options.m)
 
   # set up handler
@@ -139,7 +139,7 @@ def nsinstall(argv):
         entries = [os.path.join(srcpath, e) for e in os.listdir(srcpath)]
         copy_all_entries(entries, targetpath)
         # options.t is not relevant for directories
-        if os.name != 'nt' and options.m:
+        if options.m:
           os.chmod(targetpath, options.m)
       elif options.t:
         if os.path.exists(targetpath):