From 7eaec5ec4d644e4c1a602fed002e92cab8f1cf14 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Thu, 9 Jan 2014 21:28:38 +0100 Subject: [PATCH] Fix bug where local package installation failed --- common/tasks/packages.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/tasks/packages.py b/common/tasks/packages.py index ec04ba3..a266571 100644 --- a/common/tasks/packages.py +++ b/common/tasks/packages.py @@ -70,12 +70,14 @@ class InstallLocalPackages(Task): for package_src in info.packages.local: pkg_name = os.path.basename(package_src) - package_dst = os.path.join('/tmp', pkg_name) - copy(package_src, os.path.join(info.root, package_dst)) + package_rel_dst = os.path.join('tmp', pkg_name) + package_dst = os.path.join(info.root, package_rel_dst) + copy(package_src, package_dst) + package_path = os.path.join('/', package_rel_dst) env = os.environ.copy() env['DEBIAN_FRONTEND'] = 'noninteractive' log_check_call(['/usr/sbin/chroot', info.root, - '/usr/bin/dpkg', '--install', package_dst], + '/usr/bin/dpkg', '--install', package_path], env=env) os.remove(package_dst)