diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
| commit | 09a45d745269a419b0c5da0664912e061dc8e5d3 (patch) | |
| tree | c5c0af33093087f10f0caf5ce021aa4cb0b4a879 /src/lib/Bcfg2/Client/Tools/POSIX/File.py | |
| parent | 648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 (diff) | |
| parent | f35c38e87eafffb497338b9273fe84f284a41dcf (diff) | |
| download | bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.gz bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.bz2 bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.zip | |
Merge remote branch 'upstream/master' into jasons-hacking
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") |