mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 15:36:27 +00:00
Merge pull request #129 from osallou/fix_local_packages
fix local package installation
This commit is contained in:
commit
43c371c80a
1 changed files with 5 additions and 3 deletions
|
@ -13,6 +13,8 @@ class AddManifestPackages(Task):
|
|||
import re
|
||||
remote = re.compile('^(?P<name>[^/]+)(/(?P<target>[^/]+))?$')
|
||||
for package in info.manifest.packages['install']:
|
||||
match = None
|
||||
if remote.match(package):
|
||||
match = remote.match(package).groupdict()
|
||||
if match is not None:
|
||||
info.packages.add(match['name'], match['target'])
|
||||
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue