aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoridl0r <idl0r@gentoo.org>2009-09-12 10:54:38 +0000
committeridl0r <idl0r@gentoo.org>2009-09-12 10:54:38 +0000
commit56c9d8e32eb919adf72ed98eaf011ca70d67da07 (patch)
tree6f2a13f5fac94432dacc4ba1f51d700406f24e81
parentRemove EXPERIMENTAL option, make it default. (diff)
downloadgentoolkit-56c9d8e32eb919adf72ed98eaf011ca70d67da07.tar.gz
gentoolkit-56c9d8e32eb919adf72ed98eaf011ca70d67da07.tar.bz2
gentoolkit-56c9d8e32eb919adf72ed98eaf011ca70d67da07.zip
Fix bug 284657, thanks to Andrew Gaffney <agaffney@gentoo.org>.
svn path=/trunk/gentoolkit-dev/; revision=680
-rw-r--r--ChangeLog3
-rwxr-xr-xsrc/echangelog/echangelog20
2 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0730b22..50bf5ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-12-09: Christian Ruppert <idl0r@gentoo.org>
+ * src/echangelog/echangelog: Fix bug 284657, thanks to Andrew Gaffney <agaffney@gentoo.org>.
+
2009-09-09: Christian Ruppert <idl0r@gentoo.org>
* src/imlate/imlate: Bump to 0.0.4.
Add SLOT support.
diff --git a/src/echangelog/echangelog b/src/echangelog/echangelog
index 5468732..83561aa 100755
--- a/src/echangelog/echangelog
+++ b/src/echangelog/echangelog
@@ -342,20 +342,22 @@ while (<C>) {
}
sub git_unknown_objects {
- my $object = $_;
-
- return if -d $object;
- return if $File::Find::dir =~ m/^\.\/\.git\/?/;
-
- open(C, '-|', "${vcs} status ${object} 2>&1 1>/dev/null");
- push(@unknown, $object) if defined(<C>);
- close(C);
+ open(GIT, "-|", "${vcs} ls-files --exclude-standard --others");
+ while(defined( my $line = <GIT> )) {
+ chomp($line);
+
+ # IMHO we can skip those files, even if they're untracked
+ #next if $line =~ m/^\.gitignore$/;
+
+ push(@unknown, $line);
+ }
+ close(GIT);
}
# git only shows files already added so we need to check for unknown files
# separately here.
if($vcs eq "git") {
- find(\&git_unknown_objects, "./");
+ git_unknown_objects();
}
# Separate out the trivial files for now