diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-12-03 16:16:41 -0600 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-12-03 16:16:41 -0600 |
| commit | 350db854319af526818c2ffcac285ae445b0213d (patch) | |
| tree | d13d486ab856c37ad194653f46ac329bb75b3338 /src/lib/Bcfg2/Client/Tools/POSIX/File.py | |
| parent | a8c2c14b0bf39d101f3ecc4b3aafc01fabad02d5 (diff) | |
| parent | 2983b0c358ef25e7c34ccdeb3ab1f8d6a6f9ae90 (diff) | |
| download | bcfg2-350db854319af526818c2ffcac285ae445b0213d.tar.gz bcfg2-350db854319af526818c2ffcac285ae445b0213d.tar.bz2 bcfg2-350db854319af526818c2ffcac285ae445b0213d.zip | |
Merge branch 'master' of github.com:Bcfg2/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/File.py')
| -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") |