[Piuparts-commits] [piuparts] 06/06: reordering, formatting, typo fixes

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 5b2f829c888d8fbeac284388bd39fe27b7e0438f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Dec 20 19:25:00 2016 +0100

    reordering, formatting, typo fixes
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts-unused-examples/post_chroot_unpack_key_setup | 3 ++-
 debian/changelog                                                    | 3 ++-
 piuparts.py                                                         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/custom-scripts/scripts-unused-examples/post_chroot_unpack_key_setup b/custom-scripts/scripts-unused-examples/post_chroot_unpack_key_setup
index 06f1f96..c8ac173 100755
--- a/custom-scripts/scripts-unused-examples/post_chroot_unpack_key_setup
+++ b/custom-scripts/scripts-unused-examples/post_chroot_unpack_key_setup
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# we rely on wget being available, make sure to use "--include=wget" in your deboostrap cmdline
+# we rely on gnupg and wget being available,
+# make sure to use "--include=gnupg,wget" in your debootstrap cmdline
 echo "Setting up https://example.com/internal_key.asc for apt-get usage."
 wget -O - 'https://example.com/internal_key.asc' | apt-key add -
 
diff --git a/debian/changelog b/debian/changelog
index 10fec01..a329ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ piuparts (0.74) UNRELEASED; urgency=medium
     - Also consider bugs filed against source packages.
   * piuparts-reports.py:
     - Mark arch:all packages with an :all suffix in package lists.
-  * pre_install_database-server: Use default-mysql-* from stretch onwards.
+  * scripts/pre_install_database-server: Use default-mysql-* from stretch
+    onwards.
   * scripts/post-{install,purge}-exceptions: Wait for dkms progress indicator
     to terminate.
   * custom-scripts/scripts-debug-{remove,purge}: Improved debugging of
diff --git a/piuparts.py b/piuparts.py
index 2b1913b..b6d83c6 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -288,9 +288,9 @@ class Settings:
             "/var/lib/dpkg/statoverride",
             "/var/lib/dpkg/statoverride-old",
             "/var/log/alternatives.log",
+            "/var/log/apt/eipp.log.xz",
             "/var/log/apt/history.log",
             "/var/log/apt/term.log",
-            "/var/log/apt/eipp.log.xz",
             "/var/log/bootstrap.log",
             "/var/log/dbconfig-common/dbc.log",
             "/var/log/dpkg.log",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git