|
|
@ -118,10 +118,22 @@ class PackageDefinition: |
|
|
|
self.provided_deps[self.name] = None |
|
|
|
self.provided_deps[self.name] = None |
|
|
|
if fname.endswith('.wrap'): |
|
|
|
if fname.endswith('.wrap'): |
|
|
|
self.parse_wrap(fname) |
|
|
|
self.parse_wrap(fname) |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
self.guess_type(); |
|
|
|
self.directory = self.values.get('directory', self.name) |
|
|
|
self.directory = self.values.get('directory', self.name) |
|
|
|
if os.path.dirname(self.directory): |
|
|
|
if os.path.dirname(self.directory): |
|
|
|
raise WrapException('Directory key must be a name and not a path') |
|
|
|
raise WrapException('Directory key must be a name and not a path') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def guess_type(self) -> None: |
|
|
|
|
|
|
|
if os.path.exists(os.path.join(self.filename, '.git')): |
|
|
|
|
|
|
|
# This is a git subproject without wrap file. Either the user cloned |
|
|
|
|
|
|
|
# it manually, or it's a git submodule. The revision is used in |
|
|
|
|
|
|
|
# msubprojects.py to update the git repo. If it's a submodule the repo |
|
|
|
|
|
|
|
# is likely detached and revision will be empty. |
|
|
|
|
|
|
|
res, stdout = quiet_git(['branch', '--show-current'], self.filename) |
|
|
|
|
|
|
|
self.values['revision'] = stdout.strip() |
|
|
|
|
|
|
|
self.type = 'git' |
|
|
|
|
|
|
|
|
|
|
|
def parse_wrap(self, fname: str) -> None: |
|
|
|
def parse_wrap(self, fname: str) -> None: |
|
|
|
try: |
|
|
|
try: |
|
|
|
self.config = configparser.ConfigParser(interpolation=None) |
|
|
|
self.config = configparser.ConfigParser(interpolation=None) |
|
|
|