janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

projects.py: Read /usr/share/doc/packages/<name>/VERSION, too

Browse source 
Add support for searching VERSION below the project root
_and_ below /usr/share/doc/packages/

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-18 12:32:31 +00:00
commit 82a3f4dc92
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/projects.py
View file

@ -388,13 +388,23 @@ def get_value(name, section, key):
proj_root = topdir proj_root = topdir
else: else:
proj_root = projs_root + '/' + name proj_root = projs_root + '/' + name
debug("proj_root = " + proj_root) debug("proj_root = " + proj_root)
if section == 'version': if section == 'version':
file = open(proj_root + '/VERSION', 'r') proj_version_dirs = [ proj_root ]
r=file.read().replace('\n', '').replace('-dev', '') if proj_root != topdir:
file.close() proj_version_dirs.append('/usr/share/doc/packages/' + name)
return r for d in proj_version_dirs:
version_path = d + '/VERSION'
try:
with open(version_path) as fd:
r = fd.read().replace('\n', '').replace('-dev', '')
fd.close()
return r
except EnvironmentError:
debug("ignoring unreadable file " + version_path)
continue
raise Exception("No version file found for project \"" + name + "\"")
path = proj_root + '/make/project.conf' path = proj_root + '/make/project.conf'
#print('path = ', path, 'top_name = ', top_name, 'name = ', name) #print('path = ', path, 'top_name = ', top_name, 'name = ', name)