Merge ~ahasenack/ubuntu/+source/base-files:focal-handle-was-removed-1895302 into ubuntu/+source/base-files:ubuntu/focal-devel

[Andreas Hasenack]

Same as https://code.launchpad.net/~ahasenack/ubuntu/+source/base-files/+git/base-files/+merge/390766, but for focal

Linked SRU bug has the template filled out, including a test case.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/motd-news-wasremoved-handling/

[Bryce Harrington (bryce)]

See comments on the Xenial MP.

review: Approve

[Andreas Hasenack (ahasenack)]

After the xenial discussion, tagging and uploading b7ace615b967b4c3b790ca268dc889765add1292

$ git push pkg upload/11ubuntu5.3
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 4 threads
Compressing objects: 100% (21/21), done.
Writing objects: 100% (21/21), 2.81 KiB | 2.81 MiB/s, done.
Total 21 (delta 15), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/base-files
 * [new tag] upload/11ubuntu5.3 -> upload/11ubuntu5.3

$ dput ubuntu ../base-files_11ubuntu5.3_source.changes
Checking signature on .changes
gpg: ../base-files_11ubuntu5.3_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../base-files_11ubuntu5.3.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading base-files_11ubuntu5.3.dsc: done.
  Uploading base-files_11ubuntu5.3.tar.xz: done.
  Uploading base-files_11ubuntu5.3_source.buildinfo: done.
  Uploading base-files_11ubuntu5.3_source.changes: done.
Successfully uploaded packages.

Unmerged commits

b7ace61... by Andreas Hasenack on 2020-09-16

changelog

15c3a02... by Andreas Hasenack on 2020-09-11

    - d/motd-news-config.postinst: always remove /e/d/motd-news.wasremoved
      if present

833df15... by Andreas Hasenack on 2020-09-16

    - d/postinst.in: only consider creating the .wasremoved file in upgrades,
      never fresh installs like in debootstrap for example

caad634... by Andreas Hasenack on 2020-09-16

    - d/postinst.in: re-arrange the cascading conditionals around the
      creation of the .wasremoved file for better clarity

57f9ebf... by Andreas Hasenack on 2020-09-11

  * Fix handling of /e/d/motd-news.wasremoved (LP: #1895302):
    - d/postinst.in: check if ubuntu-server is installed before creating
      the .wasremoved file

diff --git a/debian/changelog b/debian/changelog
index 40b6cd2..9acd5bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+base-files (11ubuntu5.3) focal; urgency=medium
+
+  * Fix handling of /e/d/motd-news.wasremoved (LP: #1895302):
+    - d/postinst.in: check if ubuntu-server is installed before creating
+      the .wasremoved file
+    - d/postinst.in: re-arrange the cascading conditionals around the
+      creation of the .wasremoved file for better clarity
+    - d/postinst.in: only consider creating the .wasremoved file in upgrades,
+      never fresh installs like in debootstrap for example
+    - d/motd-news-config.postinst: always remove /e/d/motd-news.wasremoved
+      if present
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 16 Sep 2020 10:52:35 -0300
+
 base-files (11ubuntu5.2) focal; urgency=medium
 
   [ Andreas Hasenack ]
diff --git a/debian/motd-news-config.postinst b/debian/motd-news-config.postinst
index a73427f..0be04fd 100644
--- a/debian/motd-news-config.postinst
+++ b/debian/motd-news-config.postinst
@@ -33,9 +33,9 @@ case "$1" in
           fi
           if [ -e /etc/default/motd-news.wasremoved ] && [ -e /etc/default/motd-news ]; then
               sed -i -e 's/^ENABLED=1/# Changed by motd-news-config.postinst:\n# config file was manually removed - disable the service\nENABLED=0/' /etc/default/motd-news
-              rm /etc/default/motd-news.wasremoved
           fi
       fi
+      rm -f /etc/default/motd-news.wasremoved
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postinst.in b/debian/postinst.in
index c347a62..055c914 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -130,12 +130,16 @@ fi
 # it does not put back the file with default contents which would
 # re-enable motd-news
 motd_news_config="/etc/default/motd-news"
-if [ ! -e ${motd_news_config} ]; then
-  if [ ! -e ${motd_news_config}.dpkg-remove ]; then
-    if [ ! -e ${motd_news_config}.dpkg-backup ]; then
-      touch ${motd_news_config}.wasremoved
-    fi
-  fi
+# only in upgrades, never fresh installs like in debootstrap
+if [ "$2" != "" ] && \
+   [ ! -e ${motd_news_config} ] && \
+   [ ! -e ${motd_news_config}.dpkg-remove ] && \
+   [ ! -e ${motd_news_config}.dpkg-backup ]; then
+      # The .wasremoved file only matters if ubuntu-server is installed,
+      # because that's what will pull in motd-news-config
+      if dpkg -l ubuntu-server 2>/dev/null | grep -q ^i; then
+        touch ${motd_news_config}.wasremoved
+      fi
 fi
 
 #DEBHELPER#