To: debian-dak@lists.debian.org
Cc: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Dec 2015 08:01:37 +0100 (14 hours, 9 minutes, 8 seconds ago)
Resent-From: debian-dak@lists.debian.org
We have it readily available, and most scripts try to get it back from
the changes file anyway.
This makes things consistent for the scripts, so they won't get confused
by aliases (due to codenames or suite mappings) depending on whatever is
in the .changes file.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Joerg Jaspert <joerg@debian.org>
continue
script = rule['Script']
continue
script = rule['Script']
- retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename)], shell=False)
+ retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename), suite.suite_name], shell=False)
if retcode != 0:
print "W: error processing {0}.".format(f.filename)
remaining.append(f)
if retcode != 0:
print "W: error processing {0}.".format(f.filename)
remaining.append(f)
scriptname=byhand-debian-faq
scriptname=byhand-debian-faq
-if [ $# -lt 4 ]; then
- echo "usage: ${scriptname} <byhand-file> <version> <arch> <changes-file>" >&2
+if [ $# -lt 5 ]; then
+ echo "usage: ${scriptname} <byhand-file> <version> <arch> <changes-file> <suite>" >&2
version="${2}"
architecture="${3}"
changes="${4}"
version="${2}"
architecture="${3}"
changes="${4}"
-suite="$(awk '/^Distribution:/ { print $2 }' < "${changes}")"
case "${suite}" in
unstable|sid)
: # okay
case "${suite}" in
unstable|sid)
: # okay
-if [ $# -lt 4 ]; then
- echo "Usage: $0 filename version arch changes_file"
+if [ $# -lt 5 ]; then
+ echo "Usage: $0 filename version arch changes_file suite"
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
error "Invalid version: '$VERSION'"
fi
error "Invalid version: '$VERSION'"
fi
-# Get the target suite from the Changes file
-# NOTE: it may be better to pass this to the script as a parameter!
-SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')"
- "")
- error "Error: unable to determine suite from Changes file"
- ;;
unstable|sid|*-proposed-updates)
: # nothing to do
;;
unstable|sid|*-proposed-updates)
: # nothing to do
;;
-if [ $# -lt 4 ]; then
- echo "Usage: $0 filename version arch changes_file"
+if [ $# -lt 5 ]; then
+ echo "Usage: $0 filename version arch changes_file suite"
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
error() {
echo "$*"
exit 1
}
error() {
echo "$*"
exit 1
}
-# Get the target suite from the Changes file
-# NOTE: it may be better to pass this to the script as a parameter!
-SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')"
- "")
- error "Error: unable to determine suite from Changes file"
- ;;
unstable|sid)
: # OK for automated byband processing
;;
unstable|sid)
: # OK for automated byband processing
;;
-if [ $# -lt 4 ]; then
- echo "Usage: $0 filename version arch changes_file"
+if [ $# -lt 5 ]; then
+ echo "Usage: $0 filename version arch changes_file suite"
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
VERSION="$2"
ARCH="$3"
CHANGES="$4" # Changes file for the upload
-# Get the target suite from the Changes file
-# NOTE: it may be better to pass this to the script as a parameter!
-SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')"
- "")
- echo "Error: unable to determine suite from Changes file"
- exit 1
- ;;
- unstable|sid)
+ unstable|sid|*-proposed-updates)