The following commit has been merged in the sourcev3 branch:
commit 632c7ee03ebfd7a31bff486ae7f0cd43d4c0cfbf
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Fri Mar 14 19:35:58 2008 +0100
Misc bugfixes
* scripts/Dpkg/Source/Package/V3_0/git.pm (can_build): Add the missing
can_build() function. It checks if the source directory contains a .git
directory.
* scripts/Dpkg/Source/Patch.pm (get_type): Fix format specifier.
diff --git a/scripts/Dpkg/Source/Package/V3_0/git.pm
b/scripts/Dpkg/Source/Package/V3_0/git.pm
index 73171a6..1b4bef8 100644
--- a/scripts/Dpkg/Source/Package/V3_0/git.pm
+++ b/scripts/Dpkg/Source/Package/V3_0/git.pm
@@ -104,6 +104,11 @@ sub read_git_config {
return \%ret;
}
+sub can_build {
+ my ($self, $dir) = @_;
+ return (-d "$dir/.git", _g("doesn't contain a git repository"));
+}
+
sub do_build {
my ($self, $dir) = @_;
my @argv = @{$self->{'options'}{'ARGV'}};
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index 2135be0..c186212 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -410,7 +410,7 @@ sub get_type {
} else {
-f _ && return _g("plain file");
-d _ && return _g("directory");
- -l _ && return sprintf(_g("symlink to %"), readlink($file));
+ -l _ && return sprintf(_g("symlink to %s"), readlink($file));
-b _ && return _g("block device");
-c _ && return _g("character device");
-p _ && return _g("named pipe");
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
