[cranky][PATCH] cranky: fix close helper in trusty

Marcelo Henrique Cerri marcelo.cerri at canonical.com
Fri Nov 30 19:19:17 UTC 2018


dpkg-parsechangelog in trusty requires no space between flags and values.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 cranky/master-helpers/close | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cranky/master-helpers/close b/cranky/master-helpers/close
index fbf37c7fc1bd..210705c1ecf8 100755
--- a/cranky/master-helpers/close
+++ b/cranky/master-helpers/close
@@ -42,7 +42,7 @@ fi
 branch="${DEBIAN#*.}"
 
 # Check if changelog is open
-series=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Distribution)
+series=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution)
 if [ "$series" != 'UNRELEASED' ]; then
 	echo "The last entry of the changelog is already released."
 	exit 1
@@ -63,9 +63,9 @@ if [ "$branch" != 'master' ]; then
 	# For backports, insert the changes from the base derivative.
 	# Straight derivatives and backports such as hwe and hwe-edge, should
 	# skip that step and fetch the entries directly from the master kernel.
-	version=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Version)
+	version=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion)
 	if [[ $version == *~* ]]; then
-		base_version=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Version -c 1 -o 1)
+		base_version=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion -c1 -o1)
 		base_changelog="${DEBIAN%-*}/changelog"
 		if [ -f "$base_changelog" ] && [ "$DEBIAN" != "${DEBIAN%-*}" ]; then
 			run ./debian/scripts/misc/insert-ubuntu-changes "$DEBIAN/changelog" "${base_version%%~*}" "${version%%~*}" "$base_changelog"
@@ -79,7 +79,7 @@ if [ "$branch" != 'master' ]; then
 	    # entry that refers to the master version used as base (ie a line
 	    # containing "[ Ubuntu: 4.15.0-39.42 ]"):
 	    while true; do
-		    changes=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Changes -c 1 -o "$offset")
+		    changes=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SChanges -c1 -o"$offset")
 		    if ! [ "$changes" ]; then
 			    echo "Failed to retrieve base master version from changelog file: $DEBIAN/changelog"
 			    exit 1
@@ -88,7 +88,7 @@ if [ "$branch" != 'master' ]; then
 		    [ "$base_master_version" ] && break
 		    offset=$(( $offset + 1 ))
 	    done
-	    master_version=$(dpkg-parsechangelog -l debian.master/changelog -S Version)
+	    master_version=$(dpkg-parsechangelog -ldebian.master/changelog -SVersion)
 	    if ! [ "$master_version" ]; then
 		    echo "Failed to retrieve current master version from changelog: $DEBIAN/changelog"
 		    exit 1
@@ -112,7 +112,7 @@ fi
 series=''
 offset=0
 while true; do
-	series=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Distribution -c 1 -o "$offset")
+	series=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution -c1 -o"$offset")
 	if [ "$series" ] && [ "$series" != 'UNRELEASED' ]; then
 		break
 	fi
@@ -126,9 +126,9 @@ fi
 run dch --nomultimaint -c "$DEBIAN/changelog" -r -D "$series" ''
 
 # Commit changes
-package=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Source)
+package=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SSource)
 prefix="Ubuntu$(echo "$package" | sed -r -e 's/linux(-?)/\1/')-"
-version=$(dpkg-parsechangelog -l "$DEBIAN/changelog" -S Version)
+version=$(dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion)
 run git commit -sam "UBUNTU: $prefix$version"
 
 # This should only show the tag. If it starts tagging, we might revisit
-- 
2.17.1




More information about the kernel-team mailing list