[Piuparts-commits] [piuparts] 10/11: p: fix schroot usage of chroot names without colon

[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 ed44050fd1fe23e45a33f47bb4d1897f0f499571
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Jan 20 03:34:40 2015 +0100

    p: fix schroot usage of chroot names without colon
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 1 +
 piuparts.py      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 03198aa..ad08772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ piuparts (0.63) UNRELEASED; urgency=medium
     - Reinstall base system packages missing upon removal with
       --no-install-recommends.
     - Mount /dev/pts into the chroot. Wanted by recent apt.
+    - Fix usage of schroot with chroot names without ':'.  (Closes: #773874)
   * piuparts.conf:
     - Enable --warn-on-debsums-errors for all jessie tests.
     - Add new suite: jessie-pu (test only packages in jessie-proposed-updates).
diff --git a/piuparts.py b/piuparts.py
index c2c47ad..2893111 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -817,7 +817,7 @@ class Chroot:
         run(prefix + ["tar", "-C", self.name, "-zxf", tarball])
 
     def setup_from_schroot(self, schroot):
-        self.schroot_session = schroot.split(":")[1] + "-" + str(uuid.uuid1()) + "-piuparts"
+        self.schroot_session = schroot.split(":", 1)[-1] + "-" + str(uuid.uuid1()) + "-piuparts"
         run(['schroot', '--begin-session', '--chroot', schroot , '--session-name', self.schroot_session])
         ret_code, output = run(['schroot', '--chroot', "session:" + self.schroot_session, '--location'])
         self.name = output.strip()

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