[gentoo-commits] gentoolkit r556 - trunk/src/echangelog

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2009-04-30 15:06:15 +0000 (Thu, 30 Apr 2009)
New Revision: 556

Modified:
   trunk/src/echangelog/echangelog
Log:
Fixed git detection.


Modified: trunk/src/echangelog/echangelog
===================================================================
--- trunk/src/echangelog/echangelog	2009-04-30 14:22:10 UTC (rev 555)
+++ trunk/src/echangelog/echangelog	2009-04-30 15:06:15 UTC (rev 556)
@@ -90,11 +90,16 @@
 	$vcs = "cvs";
 } elsif ( -d '.svn' ) {
 	$vcs = "svn";
-} elsif ( -f '/usr/bin/git' and open GIT, "git rev-parse --git-dir |" ) {
-	$vcs = "git";
-	close GIT;
 } else {
-	die "No CVS, .git, .svn directories found, what kind of repo is this?";
+	if ( -x '/usr/bin/git' ) {
+		open(GIT, '-|', "git rev-parse --git-dir 2>/dev/null");
+		$vcs = "git" if defined(<GIT>);
+		close(GIT);
+	}
+
+	if ( ! $vcs ) {
+		die "No CVS, .git, .svn directories found, what kind of repo is this?";
+	}
 }
 
 # Read the current ChangeLog