cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/ds-identify-reset-set-f into cloud-init:master.

Commit message:
ds-identify: fix bug where filename expansion was left on.

The script is written to have the protection of disabling filename
expansion (set -f) and explicitly enabling expansion when needed.
However, the check_config function failed to disable it after enabling.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/320656
-- 
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/ds-identify-reset-set-f into cloud-init:master.

diff --git a/tools/ds-identify b/tools/ds-identify
index e138d78..6f1e983 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -473,7 +473,7 @@ check_config() {
         files="$*"
     fi
     shift
-    set +f; set -- $files; set +f;
+    set +f; set -- $files; set -f;
     if [ "$1" = "$files" -a ! -f "$1" ]; then
         return 1
     fi