Changeset d928c71

Timestamp:

09/22/2013 07:17:17 AM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

3fed586

Parents:

90bfb42e

Message:

Merge trunk r3726

File:

• common/libs/func_book_parser (modified) (1 diff)

common/libs/func_book_parser

@@ -32 +32 @@
            cd ${PROGNAME}-$LFSVRS
            echo "Checking out $LFSVRS at $PWD in $TREE"
-           git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+           git checkout -b ${TREE} ${TREE} >>$LOGDIR/$LOG 2>&1
         fi
     else
       cd ${PROGNAME}-$LFSVRS
       case $PROGNAME in
-        clfs*)  git pull >>$LOGDIR/$LOG 2>&1 ;;
+        clfs*)  git checkout master >>$LOGDIR/$LOG 2>&1
+                git pull >>$LOGDIR/$LOG 2>&1
+                if [ ! $TREE == "development" ]; then
+                   git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+                fi
+        ;;
         lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
         *) ;;