[SCM] tasksel repository branch, master, updated. e805ffe705d2c00cafb1169f1422c3f47351fc2d
The branch, master has been updated
via e805ffe705d2c00cafb1169f1422c3f47351fc2d (commit)
from f35c74a1a4d19ddc8786a367fb7d33faa0be7204 (commit)
- Shortlog ------------------------------------------------------------
e805ffe Ignore .git directory in places that ignore .svn.
Summary of changes:
debian/changelog | 1 +
doincludes.pl | 2 +-
listpackages.pl | 2 +-
makedesc.pl | 2 +-
makeoverride.pl | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit e805ffe705d2c00cafb1169f1422c3f47351fc2d
Author: Joey Hess <joey@kodama.kitenet.net>
Date: Sat May 31 17:46:09 2008 -0400
Ignore .git directory in places that ignore .svn.
diff --git a/debian/changelog b/debian/changelog
index 7b607ab..090b7b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ tasksel (2.75) UNRELEASED; urgency=low
- DEBUG=0 has no effect when building anymore, removed that from rules
file.
* Drop empty /usr/lib/tasksel/packages from tasksel-data.
+ * Ignore .git directory in places that ignore .svn.
-- Joey Hess <joeyh@debian.org> Wed, 14 May 2008 17:10:27 -0400
diff --git a/doincludes.pl b/doincludes.pl
index 62c6064..5da650a 100755
--- a/doincludes.pl
+++ b/doincludes.pl
@@ -30,7 +30,7 @@ find(\&processfile, $dir);
sub processfile {
my $file=$_; # File::Find craziness.
$file eq 'po' && -d $file && ($File::Find::prune = 1);
- return if $File::Find::dir=~/\.svn/;
+ return if $File::Find::dir=~/\.(svn|git)/;
return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
my @lines;
open (IN, $file) or die "$file: $!";
diff --git a/listpackages.pl b/listpackages.pl
index c07d161..c3b9fce 100755
--- a/listpackages.pl
+++ b/listpackages.pl
@@ -24,7 +24,7 @@ find(\&processfile, $dir);
sub processfile {
my $file=$_; # File::Find craziness.
$file eq 'po' && -d $file && ($File::Find::prune = 1);
- return if $File::Find::dir=~/\.svn/;
+ return if $File::Find::dir=~/\.(svn|git)/;
return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
open (IN, $file) or die "$file: $!";
my %fields;
diff --git a/makedesc.pl b/makedesc.pl
index c615434..a4a4122 100755
--- a/makedesc.pl
+++ b/makedesc.pl
@@ -51,7 +51,7 @@ find({ wanted => \&processfile, preprocess => sub { return sort @_}}, $dir);
sub processfile {
my $file=$_; # File::Find craziness.
$file eq 'po' && -d $file && ($File::Find::prune = 1);
- return if $File::Find::dir=~/\.svn/;
+ return if $File::Find::dir=~/\.(svn|git)/;
return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
open (IN, $file) or die "$file: $!";
my %fields;
diff --git a/makeoverride.pl b/makeoverride.pl
index b5d58d4..2d8bb2d 100755
--- a/makeoverride.pl
+++ b/makeoverride.pl
@@ -16,7 +16,7 @@ print "$_\tTask\t", (join ", ", sort keys %{$p{$_}}), "\n"
sub processfile {
my $file=$_; # File::Find craziness.
$file eq 'po' && -d $file && ($File::Find::prune = 1);
- return if $File::Find::dir=~/\.svn/;
+ return if $File::Find::dir=~/\.(svn|git)/;
return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
open (IN, $file) or die "$file: $!";
my %fields;
--
tasksel repository
Reply to: