Merge branch 'master' of git+ssh://db.debian.org/git/debian.org

* 'master' of git+ssh://db.debian.org/git/debian.org:
  Add wheezy chroots to upgrade-porter-chroots

diff --git a/debian/changelog b/debian/changelog
index 381612097658adff5c2f27daa0b3228777f3662e..9b2e787d6ea3b8aadcaa501dabc8976d52316d13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,10 @@ debian.org (XX) XXstable; urgency=low
   [ Martin Zobel-Helas ]
   * add ipython to -recommended. 
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 23 Jan 2011 22:06:44 +0100
+  [ Stephen Gran ]
+  * Add wheezy chroots to upgrade-porter-chroots
+
+ -- Stephen Gran <sgran@debian.org>  Tue, 08 Feb 2011 20:13:21 +0000
 
 debian.org (41.1) stable; urgency=low
 

diff --git a/upgrade-porter-chroots b/upgrade-porter-chroots
index a8ad21eb84ce1a58edb3fce5c647cf63d7ddaaf2..9f9ad35708f8803a7f724812cd626597b7e73097 100755 (executable)
--- a/upgrade-porter-chroots
+++ b/upgrade-porter-chroots
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-for d in lenny squeeze sid \
-         lenny_i386 squeeze_i386 sid_i386 \
-         lenny_amd64 squeeze_amd64 sid_amd64 \
+# Do we just want to use dchroot -l ?
+
+for d in lenny squeeze wheezy sid \
+         lenny_i386 squeeze_i386 wheezy_i386 sid_i386 \
+         lenny_amd64 squeeze_amd64 wheezy_amd64 sid_amd64 \
        ; do
        [ -d /chroot/$d ] || continue;
        echo; echo $d; echo