diff options
| author | Jeff Lane <jeffrey.lane@canonical.com> | 2014-09-02 17:45:12 -0400 |
|---|---|---|
| committer | Jeff Lane <jeffrey.lane@canonical.com> | 2014-09-02 17:45:12 -0400 |
| commit | a8789a173799cca15f403dcf27a11a0cadfbd570 (patch) | |
| tree | 0b4b5475eaec44036c54ee86b9db99bac65e4a1a | |
| parent | 22e931d1f99968fde1ea7114bcd201208130d140 (diff) | |
Changed test in miscellanea/get-maas-version to -s instead of -e to catch cases where the file is created, but left empty for some reason. Also improved the output on failure cases
| -rw-r--r-- | jobs/miscellanea.txt.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in index 9a0bf16..ef9b371 100644 --- a/jobs/miscellanea.txt.in +++ b/jobs/miscellanea.txt.in @@ -176,10 +176,10 @@ plugin: shell estimated_duration: 0.1 id: miscellanea/get_maas_version command: - if [ -e /etc/installed-by-maas ]; then + if [ -s /etc/installed-by-maas ]; then cat /etc/installed-by-maas else - echo "NOT FOUND" >> /dev/stderr + echo "MAAS VERSION NOT FOUND" >> /dev/stderr false fi _description: If system was installed via MAAS from a cert server, the MAAS version used should be contained in /etc/installed-by-maas |