Browse code

* remove debug -x from release * fix a bug with renamed non-git repositories

Nat! authored on 25-07-2017 20:53:31
Showing 5 changed files
... ...
@@ -1,3 +1,8 @@
1
+### 3.9.1
2
+
3
+* remove debug -x from release
4
+* fix a bug with renamed non-git repositories
5
+
1 6
 ### 3.9.0
2 7
 
3 8
 * new mulle-bootstrap shell command to make life in a virtual env even easier
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=9
34
-MULLE_EXECUTABLE_VERSION_PATCH=0
34
+MULLE_EXECUTABLE_VERSION_PATCH=1
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -998,9 +998,9 @@ required_action_for_clone()
998 998
    #
999 999
    # if scm is not git, don't try to be clever
1000 1000
    #
1001
-   if [ "${scm}" = "symlink" ]
1001
+   if [ "${scm}" != "git" ]
1002 1002
    then
1003
-      if [ -e "${newstashdir}" ]
1003
+      if [ "${scm}" != "sylimk" ] && [ -e "${newstashdir}" ]
1004 1004
       then
1005 1005
          log_fluff "\"${stashdir}\" is symlink. Ignoring possible differences."
1006 1006
          return
... ...
@@ -1683,7 +1683,11 @@ _common_main()
1683 1683
 
1684 1684
    OPTION_CHECK_USR_LOCAL_INCLUDE="`read_config_setting "check_usr_local_include" "NO"`"
1685 1685
    OVERRIDE_BRANCH="`read_config_setting "override_branch"`"
1686
-
1686
+   if [ ! -z "${OVERRIDE_BRANCH}" ]
1687
+   then
1688
+      log_info "All fetched branches will be overriden to \
1689
+\"${OVERRIDE_BRANCH}\" as config \"override_branch\" is set."
1690
+   fi
1687 1691
 
1688 1692
    DONT_WARN_SCRIPTS="`read_config_setting "dont_warn_scripts" "${MULLE_FLAG_ANSWER:-NO}"`"
1689 1693
 
... ...
@@ -821,7 +821,10 @@ computed_stashdir()
821 821
 }
822 822
 
823 823
 
824
-# this sets values to variables that should be declared
824
+#
825
+# Read the CVS from the .repositories file
826
+#
827
+# This function sets values of variables that should be declared
825 828
 # in the caller!
826 829
 #
827 830
 #   # parse_raw_clone
... ...
@@ -92,7 +92,6 @@ shell_main()
92 92
       options="${options} make"
93 93
    fi
94 94
 
95
-   set -x
96 95
    env_string="`mulle-bootstrap paths -m -1 -q "'" ${options}`"
97 96
    cmd_string="${SHELL:-/usr/bin/env bash}"
98 97