summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-10-05 20:28:04 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-10-05 20:28:04 +0000
commitcaa14901b8b2628fcf33a8051aa5a53c1e5211a0 (patch)
tree68822ac2ab893bb3bb9165a38b797621b8b5ed38
parent79fa0a382d5f98995d87394156a40bf8fb0434be (diff)
downloadbcfg2-caa14901b8b2628fcf33a8051aa5a53c1e5211a0.tar.gz
bcfg2-caa14901b8b2628fcf33a8051aa5a53c1e5211a0.tar.bz2
bcfg2-caa14901b8b2628fcf33a8051aa5a53c1e5211a0.zip
fix to new XML API
(Logical change 1.73) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@363 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Toolset.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index 7093bb88a..2e7e9b2a3 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -54,8 +54,8 @@ class Toolset(object):
def VerifySymLink(self, entry):
try:
- s = readlink(entry.attrib['dst'])
- if s == entry.attrib['src']:
+ s = readlink(entry.attrib['from'])
+ if s == entry.attrib['to']:
return True
return False
except OSError:
@@ -63,17 +63,17 @@ class Toolset(object):
def InstallSymLink(self, entry):
try:
- fmode = lstat(entry.attrib['dst'])[ST_MODE]
+ fmode = lstat(entry.attrib['from'])[ST_MODE]
if S_ISREG(fmode) or S_ISLNK(fmode):
- unlink(entry.attrib['dst'])
+ unlink(entry.attrib['from'])
elif S_ISDIR(fmode):
- system("mv %s/ %s.bak"%(entry.attrib['dst'], entry.attrib['dst']))
+ system("mv %s/ %s.bak"%(entry.attrib['from'], entry.attrib['from']))
else:
- unlink(entry.attrib['dst'])
+ unlink(entry.attrib['from'])
except OSError, e:
pass
try:
- symlink(entry.attrib['src'], entry.attrib['dst'])
+ symlink(entry.attrib['to'], entry.attrib['from'])
except OSError, e:
return False