virt-subproc: use sd, not sde, for creating target command (#648161)

diff --git a/debian/changelog b/debian/changelog
index 77e902fbe2bf4a41f6313b301004232fd92a9007..20d8cb41355f4d48ab1d3f4585e1241a9e929e77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ autopkgtest (2.0.2) unstable; urgency=low
     Martin Pitt.  Closes: #647882.
   * Improve handling of schroot root-users and root-groups.
     Colin Watson.  Closes: #667001.
+  * Correctly handle quoting of copyup/copydown filenames.  Fixes
+    but where we couldn't cope with packages' filenames containing
+    + and ~.  Report from Martin Pitt.  Closes: #648161.
+  * Clarify the spec to say that copyup/down takes encoded filenames.
 
   Packaging fixes:
   * Add Recommends against pbuilder, whose dependency resolver adt-run

diff --git a/doc/README.virtualisation-server b/doc/README.virtualisation-server
index 6c484ba248ab146a66c38e00064931f5e078f810..ca405a0b70f911d54102148bb2a45999d2eb0ad4 100644 (file)
--- a/doc/README.virtualisation-server
+++ b/doc/README.virtualisation-server
@@ -230,6 +230,8 @@ Protocol
      copydown of an executable file, `chmod +x' is run on the
      destination file after the copy.
 
+  Both filenames are url-encoded.
+
 
 * Command
        quit

diff --git a/lib/VirtSubproc.py b/lib/VirtSubproc.py
index 5d991d885d87ab10ec7868c27f721bdf9d522f9c..074b605e5ae94a769158d47b1f6d75e6b885fc72 100644 (file)
--- a/lib/VirtSubproc.py
+++ b/lib/VirtSubproc.py
@@ -259,7 +259,6 @@ def copyupdown(c, ce, upp):
        iremote = 1 - upp
        wh = ce[0]
        sd = c[1:]
-       sde = ce[1:]
        if not sd[0] or not sd[1]:
                bomb("%s paths must be nonempty" % wh)
        dirsp = sd[0][-1]=='/'
@@ -270,7 +269,7 @@ def copyupdown(c, ce, upp):
        localfd = None
        deststdout = devnull_read
        srcstdin = devnull_read
-       remfileq = shellquote_arg(sde[iremote])
+       remfileq = shellquote_arg(sd[iremote])
        if not dirsp:
                modestr = ''
                rune = 'cat %s%s' % ('><'[upp], remfileq)