]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: ts_device_init remove useless error handling
authorRuediger Meier <ruediger.meier@ga-group.nl>
Sun, 11 May 2014 23:43:03 +0000 (01:43 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 12 May 2014 14:25:16 +0000 (16:25 +0200)
Don't know why we should deinit the empty string.
This patch prepares further refactoring or error handling.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
tests/functions.sh

index 1dc671d9eb440f2c8c693d7f2291034ee95e0292..5b7324cfbffccb3626b7a9124905cd2ebf4788a7 100644 (file)
@@ -428,16 +428,13 @@ function ts_image_init {
 }
 
 function ts_device_init {
-       local img=$(ts_image_init $1 $2)
-       local dev=$($TS_CMD_LOSETUP --show -f "$img")
+       local img
+       local dev
 
-       if [ -z "$dev" ]; then
-               ts_device_deinit $dev
-               return 1                # error
-       fi
+       img=$(ts_image_init $1 $2)
+       dev=$($TS_CMD_LOSETUP --show -f "$img")
 
        echo $dev
-       return 0                        # succes
 }
 
 function ts_device_deinit {