summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-02-15 01:48:08 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-02-15 01:48:08 +0000
commit1ba7fae6179a4f08af33a4a1fcf9d17461526ebb (patch)
tree42fd9f70c9e84549ab23bfbfad12e39522c17934
parent6a0b0f779c1a094202bc999f6c5ed8c9ef217305 (diff)
downloadbcfg2-1ba7fae6179a4f08af33a4a1fcf9d17461526ebb.tar.gz
bcfg2-1ba7fae6179a4f08af33a4a1fcf9d17461526ebb.tar.bz2
bcfg2-1ba7fae6179a4f08af33a4a1fcf9d17461526ebb.zip
Fix interactive messages when no diff is needed (Resolves Ticket #397)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2811 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Tools/POSIX.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index d7521e34d..63259ca38 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -226,13 +226,14 @@ class POSIX(Bcfg2.Client.Tools.Tool):
eudiff = udiff.encode('ascii')
except:
eudiff = "Binary file: no diff printed"
- question = "Install ConfigFile %s: (y/N) " % (entry.get('name'))
nqtext = entry.get('qtext', '')
if nqtext:
nqtext += '\n'
nqtext += eudiff + '\n' + question
entry.set('qtext', nqtext)
-
+ qtxt = entry.get('qtext')
+ qtxt += "\nInstall ConfigFile %s: (y/N): " % (entry.get('name'))
+ entry.set('qtext', qtxt)
return contentStatus and permissionStatus
def InstallConfigFile(self, entry):