Browse code

Fix update bug for embedded onl

Nat! authored on 09-11-2016 14:30:49
Showing 5 changed files
... ...
@@ -34,3 +34,7 @@ tests/refresh/main/g/
34 34
 tutorial/a/.bootstrap
35 35
 tutorial/b/.bootstrap
36 36
 tutorial/c/.bootstrap
37
+mulle-mingw-cpp.exe
38
+tests/embedded-symlink/a/
39
+tests/embedded-symlink/b/
40
+tests/embedded-symlink/c/
37 41
\ No newline at end of file
... ...
@@ -1,3 +1,8 @@
1
+2.3.1
2
+===
3
+
4
+Fix failing update for projects with only embedded repositories.
5
+
1 6
 2.3
2 7
 ===
3 8
 The main new feature of 2.3 is support for working with different repositories.
... ...
@@ -528,4 +533,4 @@ eliminated.
528 533
 *  Add -V option.
529 534
 
530 535
 *  Added new did-install script phase. Depending on actual usage, I'll
531
-   probably ditch some of the other phases again. This is all in flux.
532 536
\ No newline at end of file
537
+   probably ditch some of the other phases again. This is all in flux.
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_BOOTSTRAP_VERSION_MAJOR=2
32 32
 MULLE_BOOTSTRAP_VERSION_MINOR=3
33
-MULLE_BOOTSTRAP_VERSION_PATCH=0
33
+MULLE_BOOTSTRAP_VERSION_PATCH=1
34 34
 
35 35
 MULLE_BOOTSTRAP_VERSION="${MULLE_BOOTSTRAP_VERSION_MAJOR}.${MULLE_BOOTSTRAP_VERSION_MINOR}.${MULLE_BOOTSTRAP_VERSION_PATCH}"
36 36
 MULLE_BOOTSTRAP_FAIL_PREFIX="mulle-bootstrap"
... ...
@@ -1521,18 +1521,18 @@ _common_main()
1521 1521
 
1522 1522
       check_tars
1523 1523
    else
1524
-      if dir_has_files "${CLONESFETCH_SUBDIR}"
1524
+      if dir_is_empty "${CLONESFETCH_SUBDIR}"
1525 1525
       then
1526
-         if [ -z "${EMBEDDED_ONLY}" ]
1527
-         then
1528
-            update_repositories "$@"
1529
-         fi
1530
-         update_embedded_repositories
1531
-      else
1532 1526
          log_info "Nothing to update, fetch first"
1533 1527
 
1534 1528
          return 0
1535 1529
       fi
1530
+
1531
+      if [ -z "${EMBEDDED_ONLY}" ]
1532
+      then
1533
+         update_repositories "$@"
1534
+      fi
1535
+      update_embedded_repositories
1536 1536
    fi
1537 1537
 
1538 1538
    #
... ...
@@ -232,7 +232,6 @@ _expanded_variables()
232 232
    local default
233 233
    local tmp
234 234
 
235
-
236 235
    key="`echo "${string}" | sed -n 's/^\(.*\)\${\([A-Za-z_][A-Za-z0-9_:-]*\)}\(.*\)$/\2/p'`"
237 236
    if [ -z "${key}" ]
238 237
    then
... ...
@@ -243,6 +242,7 @@ _expanded_variables()
243 242
    prefix="`echo "${string}" | sed 's/^\(.*\)\${\([A-Za-z_][A-Za-z0-9_:-]*\)}\(.*\)$/\1/'`"
244 243
    suffix="`echo "${string}" | sed 's/^\(.*\)\${\([A-Za-z_][A-Za-z0-9_:-]*\)}\(.*\)$/\3/'`"
245 244
 
245
+   default="" # crazy linux bug, where local vars are reused ?
246 246
    tmp="`echo "${key}" | sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)[:][-]\(.*\)$/\1/p'`"
247 247
    if [ ! -z "${tmp}" ]
248 248
    then