[Piuparts-commits] [piuparts] 01/03: p: run post_chroot_unpack scripts before initial apt-get update

[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 73ec52c42d1a4aad1f77ddf9bd74e5dca5505a5d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 3 19:16:07 2017 +0200

    p: run post_chroot_unpack scripts before initial apt-get update
    
    to make post_chroot_unpack_key_setup work as expected
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog | 1 +
 piuparts.py      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ff567d2..d9a8a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ piuparts (0.81) UNRELEASED; urgency=medium
   * piuparts.py:
     - Add to ignored_files:
       + /var/log/tallylog (Closes: #877592)
+    - Run post_chroot_unpack scripts before initial apt-get update.
   * Separate scripts-lenny/ from scripts-squeeze/.
   * scripts-squeeze/post_{setup,distupgrade}_squeeze-fake-essential:
     - Treat install-info as fake-essential for all tests ending in squeeze.
diff --git a/piuparts.py b/piuparts.py
index 5647d0e..a826372 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -806,6 +806,7 @@ class Chroot:
         # Useful for adjusting apt configuration e.g. for internal mirror usage
         self.run_scripts("post_chroot_unpack")
 
+        self.run(["apt-get", "update"])
         if settings.basetgz or settings.schroot or settings.existing_chroot:
             self.run(["apt-get", "-yf", "dist-upgrade"])
         self.minimize()
@@ -1096,7 +1097,6 @@ class Chroot:
         self.create_resolv_conf()
         for bindmount in settings.bindmounts:
             self.mount(bindmount, bindmount, opts="bind")
-        self.run(["apt-get", "update"])
 
     def remember_available_md5(self):
         """Keep a history of 'apt-cache dumpavail | md5sum' after initial

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