Merge pull request #138 from larsewi/CFE-4071-follow-ups

CFE-4071: Follow ups
cfengine · Oct 28, 2022 · 5dbcf89 · 5dbcf89
2 parents db900de + f9ecf26
commit 5dbcf89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cfbs/main.py b/cfbs/main.py
@@ -47,7 +47,8 @@ def main() -> int:
 
     if args.masterfiles and args.command != "init":
         user_error(
-            "The option --masterfiles is only for cfbs init, not cfbs %s" % args.command
+            "The option --masterfiles is only for 'cfbs init', not 'cfbs %s'"
+            % args.command
         )
 
     if args.non_interactive and args.command not in (

diff --git a/tests/shell/028_init_masterfiles_version_3.18.2.sh b/tests/shell/028_init_masterfiles_version_3.18.2.sh
@@ -9,4 +9,5 @@ rm -rf .git
 cfbs --non-interactive init --masterfiles=3.18.2
 grep '"name": "masterfiles"' cfbs.json
 grep '"version": "3.18.2"' cfbs.json
+grep '"commit": "a87b7fea6f7a88808b327730a4ba784a3dc664eb"' cfbs.json
 cfbs build
diff --git a/tests/shell/029_init_masterfiles_version_3.18.1-1.sh b/tests/shell/029_init_masterfiles_version_3.18.1-1.sh
@@ -9,4 +9,8 @@ rm -rf .git
 cfbs --non-interactive init --masterfiles=3.18.1-1
 grep '"name": "masterfiles"' cfbs.json
 grep '"version": "3.18.1-1"' cfbs.json
+grep '"commit": "b6e9eacc65c797f4c2b4a59056293636c320d0c9"' cfbs.json
 cfbs build
+cfbs --non-interactive update
+! grep '"version": "3.18.1-1"' cfbs.json
+! grep '"commit": "b6e9eacc65c797f4c2b4a59056293636c320d0c9"' cfbs.json