summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-09-30 21:31:31 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-09-30 21:31:31 +0000
commit9daad6c76eab18b50c01da0332c9ac41458d9995 (patch)
treed4b517345983899ae9347aff9c4124278e08cbc9
parentb564884775f2631cb5e2ece672f1201546e014c1 (diff)
downloadbcfg2-9daad6c76eab18b50c01da0332c9ac41458d9995.tar.gz
bcfg2-9daad6c76eab18b50c01da0332c9ac41458d9995.tar.bz2
bcfg2-9daad6c76eab18b50c01da0332c9ac41458d9995.zip
fix minor api problems
(Logical change 1.67) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@346 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Toolset.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index 7438da3d8..92c1147bb 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-from grp import getgrgid
-from os import chown, chmod, lstat, mkdir, stat, system, unlink
-from pwd import getpwuid
+from grp import getgrgid, getgrnam
+from os import chown, chmod, lstat, mkdir, stat, system, unlink, rename
+from pwd import getpwuid, getpwnam
from stat import *
from string import join, split
@@ -161,7 +161,7 @@ class Toolset(object):
newfile = open("%s.new"%(entry.attrib['name']), 'w')
newfile.write(entry.text)
newfile.close()
- chown(newfile.name, entry.attrib['owner'], entry.attrib['group'])
+ chown(newfile.name, getpwnam(entry.attrib['owner'])[2], getgrnam(entry.attrib['group'])[2])
chmod(newfile.name, CalcPerms(S_IFREG, entry.attrib['perms']))
if entry.attrib.get("paranoid", False) and setup.get("paranoid", False):
system("diff -u %s %s.new"%(entry.attrib['name'], entry.attrib['name']))