FCM::Util: version: should not require git

metomi · Nov 8, 2013 · 8bc562c · 8bc562c
1 parent e5f7736
commit 8bc562c
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/FCM/Util.pm b/lib/FCM/Util.pm
@@ -469,10 +469,18 @@ sub _util_of_func {
 sub _version {
     my ($attrib_ref) = @_;
     # Try "git describe"
-    my $value_hash_ref = $ACTION_OF{shell_simple}->(
+    my $value_hash_ref = eval {
-        $attrib_ref,
+        $ACTION_OF{shell_simple}->(
-        ['git', "--git-dir=$FindBin::Bin/../.git", 'describe'],
+            $attrib_ref,
-    );
+            ['git', "--git-dir=$FindBin::Bin/../.git", 'describe'],
+        );
+    };
+    if (my $e = $@) {
+        if (!$E->caught($e)) {
+            die($e);
+        }
+        $@ = undef;
+    }
     if ($value_hash_ref->{o} && !$value_hash_ref->{rc}) {
         chomp($value_hash_ref->{o});
         return "FCM " . $value_hash_ref->{o};