Telecominfraproject/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2026-01-27 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show the PKG_DEFAULT file generating an exception and allow dot versions.

Browse Source
This commit is contained in:
Jeffrey Townsend
2019-05-10 15:36:36 +00:00
parent 04c54acb14
commit 8b1dfdb4b8
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/onlpm.py
View File

@@ -150,26 +150,32 @@ class OnlPackage(object):
#
# Walk up the directory heirarchy looking for either:
#
# PKG_DEFAULTS.yml -- an onlyaml file containing default package keys.
# PKG_DEFAULTS -- An executable producing yaml containing default package keys.
# [.]PKG_DEFAULTS.yml -- an onlyaml file containing default package keys.
# [.]PKG_DEFAULTS -- An executable producing yaml containing default package keys.
#
# All matches are evaluated and applied in reverse order such that
# keys deeper in the directory heirarchy override shallower keys.
#
searchdir = os.path.dirname(pkg)
results = []
while searchdir != '/':
f = os.path.join(searchdir, "PKG_DEFAULTS.yml")
if os.path.exists(f):
results.append(onlyaml.loadf(f))
f = os.path.join(searchdir, "PKG_DEFAULTS")
if os.path.exists(f) and os.access(f, os.X_OK):
results.append(yaml.load(subprocess.check_output(f, shell=True)))
searchdir = os.path.dirname(searchdir)
try:
searchdir = os.path.dirname(pkg)
results = []
while searchdir != '/':
for prefix in [ '', '.']:
f = os.path.join(searchdir, "%sPKG_DEFAULTS.yml" % prefix)
if os.path.exists(f):
results.append(onlyaml.loadf(f))
f = os.path.join(searchdir, "%sPKG_DEFAULTS" % prefix)
if os.path.exists(f) and os.access(f, os.X_OK):
results.append(yaml.load(subprocess.check_output(f, shell=True)))
searchdir = os.path.dirname(searchdir)
for d in reversed(results):
if d:
ddict.update(d)
for d in reversed(results):
if d:
ddict.update(d)
except Exception, e:
sys.stderr.write("%s\n" % e)
sys.stderr.write("package file: %s\n" % pkg)
raise
return ddict