[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.1.5-5-g1c483c8



The following commit has been merged in the master branch:
commit ebf65d68dcc7476279676eaed81cce371083cc8e
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jan 11 00:16:34 2009 -0800

    Add pre_upstream hook to the test harness
    
    * t/runtests:
      + [RA] Add pre_upstream hook to modify the upstream source before
        generation of the .orig.tar.gz.

diff --git a/debian/changelog b/debian/changelog
index 9d444c2..92de3bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ lintian (2.1.6) UNRELEASED; urgency=low
     + [RA] Error on CMakeCache.txt files added or modified in the diff.
       Thanks, Joerg Jaspert.  (Closes: #510957)
 
+  * t/runtests:
+    + [RA] Add pre_upstream hook to modify the upstream source before
+      generation of the .orig.tar.gz.
+
  -- Russ Allbery <rra@debian.org>  Sat, 10 Jan 2009 23:47:46 -0800
 
 lintian (2.1.5) unstable; urgency=low
diff --git a/t/runtests b/t/runtests
index 576adf1..e0c0446 100755
--- a/t/runtests
+++ b/t/runtests
@@ -314,6 +314,10 @@ sub test_package {
 	runsystem("cp", "-rp", "$tmpldir/skel.upstream", $targetdir);
 	runsystem("rm", "-f", "$targetdir/.dummy");
 	runsystem("rsync", "-rp", "$origdir/upstream/", "$targetdir/");
+	if (-x "$origdir/pre_upstream") {
+	    print "running pre_upstream hook... " if $VERBOSE;
+	    runsystem("$origdir/pre_upstream", $targetdir);
+	}
 	runsystem("cd $RUNDIR && ".
 		  "tar czf ${pkg}_${orig_version}.orig.tar.gz $pkgdir");
 	runsystem("rsync", "-rp", "--exclude=debian/changelog",
diff --git a/t/tests/README b/t/tests/README
index 3983f02..a20d977 100644
--- a/t/tests/README
+++ b/t/tests/README
@@ -86,6 +86,14 @@ tags
     lexicographically sorted before comparing it with tags.  This file
     may be empty if the test case should produce no Lintian output.
 
+pre_upstream
+    If present and executable, this script is run for a non-native test
+    type after preparing the upstream directory but before creating the
+    tarball.  It receives the path to the package directory as its first
+    argument and can make any modifications that can't easily be
+    represented in the template system (such as creating files that
+    shouldn't be stored in a revision control system).
+
 pre_build
     If present and executable, this script is run after preparing the
     upstream tarball (if any) and the package directory, but before

-- 
Debian package checker


Reply to: