summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2013-02-06 15:28:43 +0200
committerTor Lillqvist <tlillqvist@suse.com>2013-02-06 15:28:43 +0200
commit4549f76d32c9ad278f5b22fc03feb5b8d041080a (patch)
tree1a487eb364279ad16048817caee030e658cb602d /nss
parent5bf437cd67d5fe2e4353069969cd99cc48e65730 (diff)
Revert "Don't bother with chmod() on Windows"
Argh, seems that it wasn't necessary after all. This reverts commit 5bf437cd67d5fe2e4353069969cd99cc48e65730.
Diffstat (limited to 'nss')
-rw-r--r--nss/nsinstall.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nss/nsinstall.py b/nss/nsinstall.py
index 9e306cf6ceae..e1728a932449 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):