[pkg-haskell-tools] 01/01: dht upload: Prefer a _source changes files over an _arch changes files.

Joachim Breitner nomeata at moszumanska.debian.org
Fri Oct 13 15:59:08 UTC 2017


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 ef0eb82e459b158715214617822e3eaf8ec70c3c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Oct 13 11:53:47 2017 -0400

    dht upload: Prefer a _source changes files over an _arch changes files.
---
 debian/changelog |  6 ++++++
 scripts/upload   | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b240399..b29edcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-haskell-tools (0.11.1) UNRELEASED; urgency=medium
+
+  * dht upload: Prefer a _source changes files over an _arch changes files. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 13 Oct 2017 11:53:15 -0400
+
 pkg-haskell-tools (0.11.0) unstable; urgency=medium
 
   [ Sean Whitton ]
diff --git a/scripts/upload b/scripts/upload
index 7383ac0..033dd4b 100755
--- a/scripts/upload
+++ b/scripts/upload
@@ -68,12 +68,16 @@ then
 	src="$(dpkg-parsechangelog -SSource)"
 	ver="$(dpkg-parsechangelog -SVersion | perl -pe 's/^\d+://')"
 	arch="$(dpkg-architecture -qDEB_HOST_ARCH)"
-	changes_path="../${src}_${ver}_${arch}.changes"
-	if [ -e $changes_path ]
+	changes_path_source="../${src}_${ver}_${arch}.changes"
+	changes_path_arch="../${src}_${ver}_${arch}.changes"
+	if [ -e $changes_path_source ]
 	then
-	  changes="$changes_path"
+	  changes="$changes_path_source"
+	elif [ -e $changes_path_arch ]
+	then
+	  changes="$changes_path_arch"
 	else
-	  echo "Cannot find $changes_path."
+	  echo "Cannot find $changes_path_source or $changes_path_arch."
 	  exit 1
 	fi
 fi

-- 
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