summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Digilio <jdigilio@imca.aps.anl.gov>2011-11-04 16:00:14 -0500
committerJoe Digilio <jdigilio@imca.aps.anl.gov>2011-11-04 16:00:14 -0500
commitedd706a27e898343a1a459b56cc382a1a20c277a (patch)
tree82e9588a5c691ebee45381324f644a9b9e5ff355
parent39e52f4d059e724d452f200343d453a74959f596 (diff)
downloadbcfg2-edd706a27e898343a1a459b56cc382a1a20c277a.tar.gz
bcfg2-edd706a27e898343a1a459b56cc382a1a20c277a.tar.bz2
bcfg2-edd706a27e898343a1a459b56cc382a1a20c277a.zip
Show prompt when only the permissions of a file have changed, and not
the contents.
-rw-r--r--src/lib/Client/Tools/POSIX.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py
index 0faa0dcda..bb6143f14 100644
--- a/src/lib/Client/Tools/POSIX.py
+++ b/src/lib/Client/Tools/POSIX.py
@@ -560,6 +560,12 @@ class POSIX(Bcfg2.Client.Tools.Tool):
binascii.b2a_base64("\n".join(diff)))
elif not tbin and isString(content, self.setup['encoding']):
entry.set('current_bfile', binascii.b2a_base64(content))
+ elif permissionStatus == False and self.setup['interactive']:
+ prompt = [entry.get('qtext', '')]
+ prompt.append("Install %s %s: (y/N): " % (entry.tag,
+ entry.get('name')))
+ entry.set("qtext", "\n".join(prompt))
+
return permissionStatus and not different