Changeset 90f822a

Timestamp:

03/25/2017 09:02:19 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

580d773

Parents:

3d48216

Message:

Merge trunk r3938:
Existence of package management files is tested even if PKGMNGT=n. Fix that.
Thanks to Michael D.L. for reporting

File:

• common/libs/func_validate_configs.sh (modified) (1 diff)

common/libs/func_validate_configs.sh

@@ -203 +203 @@
 
         # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
-        # must exist in $PKGMNGTDIR:
+        # must exist in $PKGMNGTDIR if PKGMNGT='y':
       PKGMNGT) echo -e "`eval echo $PARAM_VALS`"
-               if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not exist
-               fi
-               if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist
-               fi
-               if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size
-               fi
-               if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size
-               fi
-               if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not readable
-               fi
-               if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then
-                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable
+               if [ "$PKGMNGT" = y ]; then
+                 if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not exist
+                 fi
+                 if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist
+                 fi
+                 if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size
+                 fi
+                 if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size
+                 fi
+                 if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not readable
+                 fi
+                 if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then
+                   write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable
+                 fi
                fi
                ;;