[Piuparts-commits] [piuparts] 02/07: p-s: run piuparts on dummy package "TARBALL" to create tarballs

[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 f6cfbfe691a191521f44e00e3505906d598d1ced
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Mar 16 22:25:38 2017 +0100

    p-s: run piuparts on dummy package "TARBALL" to create tarballs
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts-jessie/post_setup_jessie-fake-essential       | 2 +-
 custom-scripts/scripts-leftovers/post_setup_fake-essential           | 2 +-
 .../scripts-no-usr-share-doc/post_setup_disable_usr_share_doc        | 2 +-
 custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential     | 2 +-
 custom-scripts/scripts-wheezy/post_setup_wheezy-fake-essential       | 2 +-
 custom-scripts/scripts/post_setup_dummy_users                        | 2 +-
 custom-scripts/scripts/post_setup_forbid_home                        | 2 +-
 custom-scripts/scripts/post_setup_minimize                           | 2 +-
 debian/changelog                                                     | 5 ++++-
 piuparts-slave.py                                                    | 2 +-
 10 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
index 240bd9a..fb67295 100755
--- a/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
+++ b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
@@ -18,7 +18,7 @@ esac
 
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# don't install fake essential packages while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts-leftovers/post_setup_fake-essential b/custom-scripts/scripts-leftovers/post_setup_fake-essential
index d2435ef..b48c0e9 100755
--- a/custom-scripts/scripts-leftovers/post_setup_fake-essential
+++ b/custom-scripts/scripts-leftovers/post_setup_fake-essential
@@ -22,7 +22,7 @@ OPENSSL=""
 
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# skip while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts-no-usr-share-doc/post_setup_disable_usr_share_doc b/custom-scripts/scripts-no-usr-share-doc/post_setup_disable_usr_share_doc
index 420f2af..db6ac75 100755
--- a/custom-scripts/scripts-no-usr-share-doc/post_setup_disable_usr_share_doc
+++ b/custom-scripts/scripts-no-usr-share-doc/post_setup_disable_usr_share_doc
@@ -6,7 +6,7 @@ log_debug() {
 }
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# skip while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
index ad74ed8..1394dc3 100755
--- a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
@@ -11,7 +11,7 @@ FAILS_TO_REMOVE=
 
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# don't install fake essential packages while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts-wheezy/post_setup_wheezy-fake-essential b/custom-scripts/scripts-wheezy/post_setup_wheezy-fake-essential
index 27cc1a6..d83edae 100755
--- a/custom-scripts/scripts-wheezy/post_setup_wheezy-fake-essential
+++ b/custom-scripts/scripts-wheezy/post_setup_wheezy-fake-essential
@@ -9,7 +9,7 @@ USED_DURING_PURGE="adduser ucf"
 
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# don't install fake essential packages while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts/post_setup_dummy_users b/custom-scripts/scripts/post_setup_dummy_users
index fafef0c..0b930e4 100755
--- a/custom-scripts/scripts/post_setup_dummy_users
+++ b/custom-scripts/scripts/post_setup_dummy_users
@@ -2,7 +2,7 @@
 set -e
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# skip while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts/post_setup_forbid_home b/custom-scripts/scripts/post_setup_forbid_home
index ff9b4a7..6a05591 100755
--- a/custom-scripts/scripts/post_setup_forbid_home
+++ b/custom-scripts/scripts/post_setup_forbid_home
@@ -2,7 +2,7 @@
 set -e
 
 case ${PIUPARTS_OBJECTS%%=*} in
-	dpkg)
+	TARBALL)
 		# skip while creating the tarball
 		exit 0
 		;;
diff --git a/custom-scripts/scripts/post_setup_minimize b/custom-scripts/scripts/post_setup_minimize
index 9884755..d3f8ed3 100755
--- a/custom-scripts/scripts/post_setup_minimize
+++ b/custom-scripts/scripts/post_setup_minimize
@@ -2,7 +2,7 @@
 set -e
 
 # only while creating the tarball
-if [ "${PIUPARTS_OBJECTS%%=*}" = "dpkg" ]
+if [ "${PIUPARTS_OBJECTS%%=*}" = "TARBALL" ]
 then
 	case $PIUPARTS_DISTRIBUTION in
 		jessie)
diff --git a/debian/changelog b/debian/changelog
index 4bb0361..f93fbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,14 @@ piuparts (0.77) UNRELEASED; urgency=medium
     - Resolve packages in "outdated" state after dependency databases are
       initialized.
   * piuparts-slave.py:
-    - Run piuparts but skip tests to create tarballs.
+    - Run piuparts on dummy package "TARBALL" (but skip tests) to create
+      tarballs.
   * piuparts-analyze.py:
   * piuparts-report.py:
     - Plot all states in the graphs.
     - Support new states in plots (varying number of columns in counts.txt).
+  * custom-scripts: Check for dummy package "TARBALL" to detect tarball
+    creation phase.
   * master-bin/detect_archive_issues:
     - Look at failed logs older than 24 hours (48 hours previously).
     - Mark logfiles for immediate recycling upon first appearance.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index eb90d36..cace98d 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -874,7 +874,7 @@ def create_chroot(config, tarball, distro):
     command.extend(["-d", distro])
     command.extend(["-s", tarball + ".new"])
     command.extend(['--no-install-purge-test', '--no-upgrade-test'])
-    command.extend(["--apt", "dpkg"])
+    command.extend(["--apt", "TARBALL"])  # dummy package name
 
     output_name = tarball + ".log"
     with open(output_name, "we") as output:

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