Merge ~rbalint/ubuntu-release-upgrader:ubuntu/master into ubuntu-release-upgrader:ubuntu/master

[Balint Reczey]

[Brian Murray (brian-murray)]

This looks good to me.

review: Approve

[Brian Murray (brian-murray)]

I double approve this.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f162d57..f2e9bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-release-upgrader (1:20.04.7) focal; urgency=medium
+
+  * debian/release-upgrade-motd: Fix typo preventing the update of the cached info.
+    This fixes the regression introduced when fixing LP: #1855271.
+  * debian/gbp.conf: Really run ./pre-build.sh before build
+
+ -- Balint Reczey <[e-mail]>  Fri, 06 Dec 2019 21:45:46 +0100
+
 ubuntu-release-upgrader (1:20.04.6) focal; urgency=medium
 
   * debian/control: Update Vcs-*: URLs
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 40ebb26..d171555 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,4 +3,4 @@ debian-branch = ubuntu/master
 debian-tag = %(version)s
 
 [buildpackage]
-pre-build = ./pre-build.sh
+prebuild = ./pre-build.sh
diff --git a/debian/release-upgrade-motd b/debian/release-upgrade-motd
index fa55232..c148c73 100755
--- a/debian/release-upgrade-motd
+++ b/debian/release-upgrade-motd
@@ -34,7 +34,7 @@ if [ -f "$stamp" ]; then
 		cat "$stamp"
 		echo
 	fi
-elif [ "(id -u)" = 0 ]; then
+elif [ "$(id -u)" = 0 ]; then
 	# No cache at all, so update in the background
 	/usr/lib/ubuntu-release-upgrader/check-new-release -q > "$stamp" &
 fi