From 2a3dd42e87ac600141b5d623dde3f7aeabe87f54 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jan 2014 11:21:34 +0100 Subject: [PATCH] fix local package installation --- 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 a21db2c..65b82a3 100644 --- a/common/tasks/packages.py +++ b/common/tasks/packages.py @@ -13,7 +13,9 @@ class AddManifestPackages(Task): import re remote = re.compile('^(?P[^/]+)(/(?P[^/]+))?$') for package in info.manifest.packages['install']: - match = remote.match(package).groupdict() + match = None + if remote.match(package): + match = remote.match(package).groupdict() if match is not None: info.packages.add(match['name'], match['target']) else: @@ -80,10 +82,10 @@ class InstallPackages(Task): absolute_package_paths = [] chrooted_package_paths = [] for package_src in local_packages: - pkg_name = os.path.basename(package_src) + pkg_name = os.path.basename(package_src.path) package_rel_dst = os.path.join('tmp', pkg_name) package_dst = os.path.join(info.root, package_rel_dst) - copy(package_src, package_dst) + copy(package_src.path, package_dst) absolute_package_paths.append(package_dst) package_path = os.path.join('/', package_rel_dst) chrooted_package_paths.append(package_path)