diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-21 09:22:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2016-12-21 09:22:38 +0000 |
| commit | b8fb732113a64bdb71fcc367d076717885ad0595 (patch) | |
| tree | 9629daa3fa9c17558c90aafd050a05c1a1e8cea0 | |
| parent | Updating irc notification handling for new upstream where the notification is... (diff) | |
| download | open-infrastructure-compute-tools-tmp-hooks.tar.xz open-infrastructure-compute-tools-tmp-hooks.zip | |
Merging upstream version 20161220.tmp-hooks
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
| -rw-r--r-- | CHANGELOG.txt | 8 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | lib/container/list | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0fd720b..8b1712f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,11 @@ +2016-12-20 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20161220. + + [ Daniel Baumann ] + * Fixing suffix in nwdiag output in container list command. + * Handling unreadable container directory properly in container list command. + 2016-12-10 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20161210. diff --git a/VERSION.txt b/VERSION.txt index d407b1f..162675c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20161210 +20161220 diff --git a/lib/container/list b/lib/container/list index f9f46fb..da8a158 100755 --- a/lib/container/list +++ b/lib/container/list @@ -318,7 +318,10 @@ EOF ;; esac -CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)" +if ls "${MACHINES}"/* > /dev/null 2>&1 +then + CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)" +fi for CONTAINER in ${CONTAINERS} do @@ -405,6 +408,15 @@ EOF ;; + nwdiag) + +cat << EOF + } +} +EOF + + ;; + xml) cat << EOF |