[Pkg-owncloud-commits] [SCM] pkg-owncloud.git branch, master, updated. 91fd6740b568347267c286b6d5b770c2f234b054

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 91fd6740b568347267c286b6d5b770c2f234b054
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue Apr 2 09:41:40 2013 +0200

    Fix the quick-update script (update from pkg-ruby-extras)

diff --git a/quick-update b/quick-update
index 6e07293..97d87d9 100755
--- a/quick-update
+++ b/quick-update
@@ -7,9 +7,9 @@ list_heads="
 for package in $packages; do
   (
     echo -n \"\$package \"
-    cat \$package/.git/refs/heads/master
+    cat \$package/.git/refs/heads/master || awk '{ if (\$2 == \"refs/heads/master\") { print(\$1) }}' \$package/.git/info/refs
   )
-done 2>/dev/null
+done
 "
 remote_list_heads=$(echo "$list_heads" | sed -e 's/\/\.git/.git/g')
 
@@ -28,12 +28,15 @@ diff remote.heads local.heads | grep '^<' | cut -d ' ' -f 2-3 | while read packa
     echo "$package" >> .pull.list
   fi
 done
-rm -f remote.heads local.heads
 
 if [ -e .pull.list ]; then
   for package in $(cat .pull.list); do
     echo "I: Updating $package ..."
-    (cd $package && gbp-pull || echo "\033[1;31;40mE: failed pulling $package\033[m")
+    (
+      cd $package &&
+        (test -e .git/gbp.conf || printf "[DEFAULT]\npristine-tar = True\n" > .git/gbp.conf) &&
+        gbp-pull || echo "\033[1;31;40mE: failed pulling $package\033[m"
+    )
   done
 fi
 

-- 
pkg-owncloud.git