[pkg-haskell-tools] 01/04: dht upload: Do not trip over an already signed .changes file.

Joachim Breitner nomeata at moszumanska.debian.org
Mon Dec 7 18:53:22 UTC 2015


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

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 3cdd81276da8b6c062b8045866ac8a8a0989c8cc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Dec 7 19:45:18 2015 +0100

    dht upload: Do not trip over an already signed .changes file.
---
 debian/changelog | 4 ++++
 scripts/upload   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c267f13..7e06d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 pkg-haskell-tools (0.10) UNRELEASED; urgency=low
 
+  [ Sven Bartscher ]
   * dht make-all: Support package names as targets, additionally to of
     full changes file names.
 
+  [ Joachim Breitner ]
+  * dht upload: Do not trip over an already signed .changes file.
+
  -- Sven Bartscher <sven.bartscher at weltraumschlangen.de>  Tue, 29 Sep 2015 17:39:55 +0200
 
 pkg-haskell-tools (0.9) unstable; urgency=medium
diff --git a/scripts/upload b/scripts/upload
index 4bf7219..45aa9f0 100755
--- a/scripts/upload
+++ b/scripts/upload
@@ -73,7 +73,7 @@ mkdir $tmpdir
 for c in $changes
 do
 	src="$(grep ^Source "$c"|grep-dctrl -s Source -n '' )"
-	ver="$(grep ^Version "$c"|grep-dctrl -s Version -n '' )"
+	ver="$(grep ^Version "$c"|grep -v GnuPG|grep-dctrl -s Version -n '' )"
 	dist="$(grep ^Distribution "$c"|grep-dctrl -s Distribution -n '' )"
 	tag="${src}_v$(echo $ver| tr ':~' _)"
 	if [ "$dist" == "UNRELEASED" ]

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



More information about the Pkg-haskell-commits mailing list