diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-30 08:11:38 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-03 10:52:13 -0600 |
| commit | 30a50cfe1959fa33cb2561ba96106e5eaa4f8ac9 (patch) | |
| tree | c2bf6d2def27ff0f0987262da507dc2bebff5867 /src | |
| parent | 41d1d29b8b545e0f636ebf26795eecd1a46bc9fb (diff) | |
| download | bcfg2-30a50cfe1959fa33cb2561ba96106e5eaa4f8ac9.tar.gz bcfg2-30a50cfe1959fa33cb2561ba96106e5eaa4f8ac9.tar.bz2 bcfg2-30a50cfe1959fa33cb2561ba96106e5eaa4f8ac9.zip | |
POSIX: Fixed handling of empty files that don't exist on client in interactive mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 5842c4e1f..9b95d2234 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -188,6 +188,10 @@ class POSIXFile(POSIXTool): prompt.append(udiff) except UnicodeEncodeError: prompt.append("Could not encode diff") + elif entry.get("empty", "true"): + # the file doesn't exist on disk, but there's no + # expected content + prompt.append("%s does not exist" % entry.get("name")) else: prompt.append("Diff took too long to compute, no " "printable diff") |