|
@@ -286,36 +286,26 @@ def lookup_recipe(args):
|
|
|
|
|
|
def package_info(args):
|
|
|
def parse_pkgdatafile(pkgdatafile):
|
|
|
+ vars = ['PKGV', 'PKGE', 'PKGR', 'PN', 'PV', 'PE', 'PR', 'PKGSIZE']
|
|
|
with open(pkgdatafile, 'r') as f:
|
|
|
- pkge = ''
|
|
|
- pkgr = ''
|
|
|
- pe = ''
|
|
|
- pr = ''
|
|
|
+ vals = dict()
|
|
|
for line in f:
|
|
|
- if line.startswith('PKGV:'):
|
|
|
- pkg_version = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PKGE:'):
|
|
|
- pkge = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PKGR:'):
|
|
|
- pkgr = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PN:'):
|
|
|
- recipe = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PV:'):
|
|
|
- recipe_version = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PE:'):
|
|
|
- pe = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PR:'):
|
|
|
- pr = line.split(':', 1)[1].strip()
|
|
|
- elif line.startswith('PKGSIZE'):
|
|
|
- pkg_size = line.split(':', 1)[1].strip()
|
|
|
- if pkge:
|
|
|
- pkg_version = pkge + ":" + pkg_version
|
|
|
- if pkgr:
|
|
|
- pkg_version = pkg_version + "-" + pkgr
|
|
|
- if pe:
|
|
|
- recipe_version = pe + ":" + recipe_version
|
|
|
- if pr:
|
|
|
- recipe_version = recipe_version + "-" + pr
|
|
|
+ for var in vars:
|
|
|
+ m = re.match(var + '(?:_\S+)?:\s*(.+?)\s*$', line)
|
|
|
+ if m:
|
|
|
+ vals[var] = m.group(1)
|
|
|
+ pkg_version = vals['PKGV'] or ''
|
|
|
+ recipe = vals['PN'] or ''
|
|
|
+ recipe_version = vals['PV'] or ''
|
|
|
+ pkg_size = vals['PKGSIZE'] or ''
|
|
|
+ if 'PKGE' in vals:
|
|
|
+ pkg_version = vals['PKGE'] + ":" + pkg_version
|
|
|
+ if 'PKGR' in vals:
|
|
|
+ pkg_version = pkg_version + "-" + vals['PKGR']
|
|
|
+ if 'PE' in vals:
|
|
|
+ recipe_version = vals['PE'] + ":" + recipe_version
|
|
|
+ if 'PR' in vals:
|
|
|
+ recipe_version = recipe_version + "-" + vals['PR']
|
|
|
print("%s %s %s %s %s" % (pkg, pkg_version, recipe, recipe_version, pkg_size))
|
|
|
|
|
|
# Handle both multiple arguments and multiple values within an arg (old syntax)
|