proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-10 15:02:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc-ls: Don't exit 1 when no container or help

Browse Source 
lxc-ls is currently exiting with return code 1 when called with --help
or when called on a system without containers.

This behaviour isn't documented in the manpage and isn't terribly intuitive.
It's been the source of quite a few weird failures in scripts running with
set -e.

As a user calling --help is a voluntary action, lxc-ls should exit 0.

Also, as lxc-ls's goal is solely to list containers, showing an error and
exiting with return code 1 when there's no container seems counter-intuitive
and error-prone.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Stéphane Graber 2012-11-12 16:20:53 -05:00
parent 9b106331e7
commit aeb958be83
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/lxc-ls.in
View File

@ -75,7 +75,7 @@ directory=$(readlink -f "$lxc_path")
for i in "$@"; do for i in "$@"; do
case $i in case $i in
--help) --help)
help; exit 1;; help; exit;;
--active) --active)
get_parent_cgroup; directory="$parent_cgroup"; shift;; get_parent_cgroup; directory="$parent_cgroup"; shift;;
--) --)
@ -90,10 +90,5 @@ if [ ! -z "$directory" ]; then
containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null) containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null)
fi fi
if [ -z "$containers" ]; then
echo "$(basename $0): no containers found" >&2
exit 1
fi
cd "$directory" cd "$directory"
ls -d $@ -- $containers ls -d $@ -- $containers