diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-11-24 15:01:08 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-11-25 07:09:31 +0000 |
| commit | 67a1352a94e73a3e17db2e2bd745f8cd74134d97 (patch) | |
| tree | 4ddf4d647b9412600881552123ba4cbe3cf8d07c /packaging-tools/mksrc.sh | |
| parent | 50fe04035307f3f61885545275c756022e343fc7 (diff) | |
mksrc.sh: Do not bail out if MODULE_VERSION not found
If the module does not have MODULE_VERSION defined in .qmake-conf
do not bail out. If the MODULE_VERSION is missing the script will
continue without calling syncqt.pl for the module.
Change-Id: I432856cf90a5f1144c9d8cc4688a2cea98151de0
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
Diffstat (limited to 'packaging-tools/mksrc.sh')
| -rwxr-xr-x | packaging-tools/mksrc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index fdc127308..5a14c8799 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -448,7 +448,7 @@ if [ $SKIPSYNCQT = no ]; then done < $MODULES else if [ -f $PACKAGE_DIR/".qmake.conf" ]; then - RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf) + RESULT=$(grep "MODULE_VERSION" $PACKAGE_DIR/.qmake.conf || true) QTSYNCQTVER=$(echo $RESULT | sed 's/.[^=]*=\(.[^ \t]*\)[ \t]*/\1/') else echo "*** WARNING .qmake.conf not found *** - not running syncqt.pl ***" @@ -457,7 +457,7 @@ if [ $SKIPSYNCQT = no ]; then echo " - Running syncqt.pl for $REPO_NAME with -version $QTSYNCQTVER" $CUR_DIR/../qtbase/bin/syncqt.pl -version $QTSYNCQTVER -outdir $PACKAGE_DIR $PACKAGE_DIR else - echo "*** WARNING sync.profile not found - not running syncqt.pl ***" + echo "*** WARNING sync.profile or MODULE_VERSION not found - not running syncqt.pl ***" fi fi fi |