Changeset 1389 for trunk/locker

Timestamp:

Dec 23, 2009, 12:11:32 PM (15 years ago)

Author:

ezyang

Message:

Make git describe more resilient, and prune .scripts-version when .scripts exists.

File:

• trunk/locker/sbin/parallel-find.pl (modified) (2 diffs)

trunk/locker/sbin/parallel-find.pl

@@ -58 +58 @@
     my $dirname = shift;
     $uid = stat($dirname)->uid;
-    open my $h, "sudo -u#$uid git --git-dir=$dirname/.git describe --tags 2>/dev/null |";
+    open my $h, "sudo -u#$uid git --git-dir=$dirname/.git describe --tags --always 2>/dev/null |";
     chomp($val = <$h>);
     if (! $val) {
@@ -78 +78 @@
         if (! $new_style) {
             $f =~ s!/\.scripts-version$!!;
+            # Don't use .scripts-version of .scripts is around!
+            if (-d "$f/.scripts") {
+                next;
+            }
         }
         if (! updatable($f)) {