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

[lintian] 01/03: collection/src-orig-index: Correct references to generated filename.



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit ea42e3727e237a897e63a4587fe5167c9a96bd49
Author: Chris Lamb <lamby@debian.org>
Date:   Wed Dec 20 18:17:11 2017 +0000

    collection/src-orig-index: Correct references to generated filename.
---
 collection/src-orig-index | 8 ++++----
 debian/changelog          | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/collection/src-orig-index b/collection/src-orig-index
index 7799e1a..65a253d 100755
--- a/collection/src-orig-index
+++ b/collection/src-orig-index
@@ -39,14 +39,14 @@ sub collect {
     my ($pkg, $type, $dir) = @_;
     my $info = Lintian::Collect->new($pkg, $type, $dir);
 
-    if (-f "$dir/orig-index.gz") {
-        unlink("$dir/orig-index.gz");
+    if (-f "$dir/src-orig-index.gz") {
+        unlink("$dir/src-orig-index.gz");
     }
 
     # Nothing to do for native packages where the two indices are
     # identical.
     if ($info->native) {
-        link("$dir/index.gz", "$dir/orig-index.gz");
+        link("$dir/index.gz", "$dir/src-orig-index.gz");
         return;
     }
 
@@ -210,7 +210,7 @@ sub index_orig {
   # Now that we have the file names we want, write them out sorted to the index
   # file.
     spawn(
-        { fail => 'error', out => "$dir/orig-index.gz" },
+        { fail => 'error', out => "$dir/src-orig-index.gz" },
         sub { print @result },
         '|', ['sort', '-k', '6'],
         '|', ['gzip', '-9nc']);
diff --git a/debian/changelog b/debian/changelog
index f09e00a..8494455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ lintian (2.5.66) UNRELEASED; urgency=medium
     + [CL] Check for Apache 2.0 packages that do not distribute their
       accompanying "NOTICE" files.  (Closes: #885042)
 
+  * collection/src-orig-index:
+    + [CL] Correct references to generated filename.
+
   * data/debhelper/compat-level:
     + [MR] Bump the experimental debhelper compat level to 12.
       (Closes: #884678)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: