summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-03-20 11:39:44 -0400
committerJoey Hess <joey@kitenet.net>2013-03-20 11:39:44 -0400
commit2cef6101c02593ca5a948a286313e93b1142cf53 (patch)
tree6490ede5d1c6d05a6da42d1c903da833341e176f
parentc6b2671217ceba031664e5c5ad914f1c92f624c5 (diff)
dh_testdir: Fix error message. Closes: #703515
-rw-r--r--debian/changelog1
-rwxr-xr-xdh_testdir11
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ae852e3..aec1b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ debhelper (9.20120609) UNRELEASED; urgency=low
* cmake: Configure with -DCMAKE_BUILD_TYPE=RelWithDebInfo
Closes: #701233
* dh_auto_test: Avoid doing anything when cross-compiling. Closes: #703262
+ * dh_testdir: Fix error message. Closes: #703515
-- Joey Hess <joeyh@debian.org> Thu, 05 Jul 2012 08:51:07 -0600
diff --git a/dh_testdir b/dh_testdir
index 8e12489..d7e945b 100755
--- a/dh_testdir
+++ b/dh_testdir
@@ -32,10 +32,19 @@ Test for the existence of these files too.
=cut
+# Run before init because init will try to read debian/control and
+# we want a nicer error message.
+checkfile('debian/control');
+
init();
inhibit_log();
-foreach my $file ('debian/control', @ARGV) {
+foreach my $file (@ARGV) {
+ checkfile($file);
+}
+
+sub checkfile {
+ my $file=shift;
if (! -e $file) {
error("\"$file\" not found. Are you sure you are in the correct directory?");
}