Skip to content

Support minor version-specific package dependencies! #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anushree-Mathur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support minor version-specific package dependencies! #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions avocado-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,27 @@ def env_check(enable_kvm):
(env_ver, env_type, cmd_pat) = helper.get_env_type(enable_kvm)
# try to check base packages using major version numbers
env_ver = env_ver.split('.')[0]
env_ver_full = env_ver.replace('.', '_') # Full version with underscore
env_deps = []
if not CONFIGFILE.has_section('deps_%s' % env_ver):
# Try full version first (e.g., deps_sles16_1)
if CONFIGFILE.has_section('deps_%s' % env_ver_full):
packages = CONFIGFILE.get('deps_%s' % env_ver_full, 'packages')
if packages != '':
env_deps = packages.split(',')
# Fallback to major version (e.g., deps_sles16)
elif CONFIGFILE.has_section('deps_%s' % env_ver_major):
packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
if packages != '':
env_deps = packages.split(',')
else:
# Fallback to base name if specific version is not found
dist = helper.get_dist()
env_ver = dist[0]
env_ver_major = dist[0]
if CONFIGFILE.has_section('deps_%s' % env_ver_major):
packages = CONFIGFILE.get('deps_%s' % env_ver_major, 'packages')
if packages != '':
env_deps = packages.split(',')

if CONFIGFILE.has_section('deps_%s' % env_ver):
packages = CONFIGFILE.get('deps_%s' % env_ver, 'packages')
if packages != '':
env_deps = packages.split(',')
for dep in env_deps:
if(dep[-1] == "$"):
#Substrings
Expand All @@ -161,12 +172,19 @@ def env_check(enable_kvm):
not_found.append(original_dep)

env_deps = []
# try to check env specific packages
if CONFIGFILE.has_section('deps_%s_%s' % (env_ver, env_type)):
# try to check env specific packages (with full version first)
if CONFIGFILE.has_section('deps_%s_%s' % (env_ver_full, env_type)):
packages = CONFIGFILE.get('deps_%s_%s' %
(env_ver, env_type), 'packages')
(env_ver_full, env_type), 'packages')
if packages != '':
env_deps = packages.split(',')
# Fallback to major version with env_type
elif CONFIGFILE.has_section('deps_%s_%s' % (env_ver_major, env_type)):
packages = CONFIGFILE.get('deps_%s_%s' %
(env_ver_major, env_type), 'packages')
if packages != '':
env_deps = packages.split(',')

for dep in env_deps:
if helper.runcmd(cmd_pat % dep, ignore_status=True)[0] != 0:
not_found.append(dep)
Expand Down