summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-12-13 11:01:19 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-12-13 11:01:19 +0000
commit267a5726ca2af9836ba349af6d6f160e9402ce9d (patch)
treedacbc4dd258a6c422f394e4265e7853022657b4f
parentd6d2c27f891d9e796c173d07fccf86f2a67ace06 (diff)
downloadbcfg2-267a5726ca2af9836ba349af6d6f160e9402ce9d.tar.gz
bcfg2-267a5726ca2af9836ba349af6d6f160e9402ce9d.tar.bz2
bcfg2-267a5726ca2af9836ba349af6d6f160e9402ce9d.zip
Fix handling of files ending in .cat or .diff [bugfix]
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4083 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Cfg.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index fafc8ec94..b273d1751 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -27,7 +27,9 @@ class FileEntry(Bcfg2.Server.Plugin.FileBacked):
self.group = False
self.op = False
self.prio = False
- if name.split('.')[-1] in ['cat', 'diff']:
+ bfname = name.split('/')[-1]
+ bid = myid.split('/')[-1]
+ if bfname[len(bid)+1:].split('.')[-1] in ['cat', 'diff']:
self.op = name.split('.')[-1]
name = name[:-(len(self.op) + 1)]
if self.name.split('/')[-1] == myid.split('/')[-1]: