Changeset de10f6c

Timestamp:

04/02/2017 08:46:55 AM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

95c46b9

Parents:

10bc5b9

Message:

Merge trunk r3949 "Fix issues in clfs"

Location:

common

Files:

• libs/func_book_parser (modified) (3 diffs)
• urls.xsl (modified) (1 diff)

common/libs/func_book_parser

@@ -9 +9 @@
 
   if [ -z $WORKING_COPY ] ; then
-# Check for Subversion instead of just letting the script hit 'svn' and fail.
-    test `type -p svn` || eval "echo \"This feature requires Subversion.\"
-    exit 1"
+# Check for Subversion or git instead of just letting the script fail.
+    case $PROGNAME in
+      lfs | hlfs)
+        test `type -p svn` || eval "echo \"This feature requires Subversion.\"
+        exit 1"
+      ;;
+      clfs*)
+        test `type -p git` || eval "echo \"This feature requires Git.\"
+        exit 1"
+      ;;
+    esac
+
     echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
 
@@ -32 +41 @@
         git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
         if [ ! $TREE == "development" ]; then
-           cd ${PROGNAME}-$LFSVRS
+           pushd ${PROGNAME}-$LFSVRS > /dev/null
            echo "Checking out $LFSVRS at $PWD in $TREE"
            git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+           popd > /dev/null
         fi
     else
       cd ${PROGNAME}-$LFSVRS
       case $PROGNAME in
-        clfs*)  git pull >>$LOGDIR/$LOG 2>&1
-                if [ ! $TREE == "development" ]; then
-                   git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
-                fi
+        clfs*)
+          # If the repo is in "detached head" state, git pull fails, so get
+          # back first to master:
+          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 ;;
@@ -50 +64 @@
     echo -ne "done\n"
 
-  else
+  else # Working copy
     echo -ne "Using $BOOK as book's sources ...\n"
   fi

common/urls.xsl

@@ -106 +106 @@
           <xsl:text>udev/</xsl:text>
         </xsl:when>
+        <xsl:when test="contains($dirname, 'iputils')">
+          <xsl:text>iputils/</xsl:text>
+        </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="$dirname"/>