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

Re: RE : : RFS: autoconf-archive (updated package)



On Wed, 13 Jul 2011 11:17:46 +0200, Kilian Krause <kilian@debian.org> wrote:
> 
> 3. Lintian still warns about:
> E: autoconf-archive source: git-patches-not-exported
> P: autoconf-archive source: unneeded-build-dep-on-quilt
> 

Hi Bastien, Hi Kilian;

As 

   lintian-info -t git-patches-not-exported 

indicates, that warning is because the source package contains a
non-empty debian/source/git-patches, but no actual patches.

I couldn't actually find a tag or branch named upstream/2011.04.12 in
your git repo on collab-maint, but if I use the current head of
upstream, then it is identical to debian-patches/2011.04.12. This seems
to have triggered a bug in the gitpkg hook which fails to detect that
you have not exported any patches.  For the moment, you can just
comment out the line in debian/source/git-patches (or delete that file),
and I'll see about fixing the gitpkg hook. I append a patch, but I'm not
sure yet that this is the best fix.

David

Attachment: pgpr01daC_DZ3.pgp
Description: PGP signature

>From e0002bf481955279fbd9e930f08afb25403ac00d Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Wed, 13 Jul 2011 08:23:24 -0300
Subject: [PATCH] quilt-patches-deb-export-hook: Count only non-blank lines in
 debian/patches/series

---
 hooks/quilt-patches-deb-export-hook |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hooks/quilt-patches-deb-export-hook b/hooks/quilt-patches-deb-export-hook
index 37afb60..1c74544 100644
--- a/hooks/quilt-patches-deb-export-hook
+++ b/hooks/quilt-patches-deb-export-hook
@@ -91,7 +91,7 @@ echo "# $patch_list exported from git by quilt-patches-deb-export-hook" > "$patc
     < "$patch_list" ; echo ) | do_patches || exit 1
 
 
-count=$(wc -l "$patch_dir/series" | cut -f1 -d' ')
+count=$(grep -c -v '^\s*$' "$patch_dir/series" | cut -f1 -d' ')
 
 if [ $count -eq 1 ]; then
     echo "No patches generated from $patch_list"
-- 
1.7.5.4


Reply to: