Ignore:
Timestamp:
10/05/2013 05:52:45 PM (11 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs
Children:
6216d18c
Parents:
3fed586
Message:

merge trunk r3730:3732

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/libs/func_book_parser

    r3fed586 rf33756b  
    3232           cd ${PROGNAME}-$LFSVRS
    3333           echo "Checking out $LFSVRS at $PWD in $TREE"
    34            git checkout -b ${TREE} ${TREE} >>$LOGDIR/$LOG 2>&1
     34           git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
    3535        fi
    3636    else
    3737      cd ${PROGNAME}-$LFSVRS
    3838      case $PROGNAME in
    39         clfs*)  git checkout master >>$LOGDIR/$LOG 2>&1
    40                 git pull >>$LOGDIR/$LOG 2>&1
     39        clfs*)  git pull >>$LOGDIR/$LOG 2>&1
    4140                if [ ! $TREE == "development" ]; then
    4241                   git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
Note: See TracChangeset for help on using the changeset viewer.