From fbf93ef7be056b26fa02565a70f66cbd7c52d55c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 11 Jun 2012 01:21:20 +0100 Subject: [PATCH] virt-subproc: use sd, not sde, for creating target command (#648161) --- debian/changelog | 4 ++++ doc/README.virtualisation-server | 2 ++ lib/VirtSubproc.py | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77e902f..20d8cb4 100644 --- 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 6c484ba..ca405a0 100644 --- 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 5d991d8..074b605 100644 --- 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) -- 2.30.2