diff options
| author | Jan Safranek <jsafrane@redhat.com> | 2014-04-18 14:59:08 +0200 |
|---|---|---|
| committer | Jan Safranek <jsafrane@redhat.com> | 2014-04-18 14:59:08 +0200 |
| commit | 91a9c755e9c95fccc08bf915ba7f196700c82923 (patch) | |
| tree | 0bffc7fbc8f560e841b1cb331b31afe06bdcef3e /src/software/test/reposetup.py | |
| parent | 45f4b021a9f13c1ec64b56ea16e2b3d2a121c41c (diff) | |
| download | openlmi-providers-91a9c755e9c95fccc08bf915ba7f196700c82923.tar.gz openlmi-providers-91a9c755e9c95fccc08bf915ba7f196700c82923.tar.xz openlmi-providers-91a9c755e9c95fccc08bf915ba7f196700c82923.zip | |
Port tests to Python 2.6
- replace various dictionary/set comprehensions
- re-implement subprocess.check_output()
- use optparse
Diffstat (limited to 'src/software/test/reposetup.py')
| -rw-r--r-- | src/software/test/reposetup.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/software/test/reposetup.py b/src/software/test/reposetup.py index 09d5605..c67514d 100644 --- a/src/software/test/reposetup.py +++ b/src/software/test/reposetup.py @@ -470,7 +470,7 @@ def _get_rpm_name_from_spec(spec_file_path): :returns: Name of rpm file builded out of particular spec file. :rtype: string """ - return subprocess.check_output(['/usr/bin/rpm', '-q', '--specfile', + return util.check_output(['/usr/bin/rpm', '-q', '--specfile', spec_file_path]).splitlines()[0] + '.rpm' def _build_pkg(rpmbuild_dir, pkg_nevra, pkg_dict): @@ -568,9 +568,8 @@ def get_yum_config(): """ if not hasattr(get_yum_config, '_yum_vars'): yumvar_dict = yum.YumBase().conf.yumvar - kwargs = { f: yumvar_dict[f] - for f in YumVars._fields if f in yumvar_dict} - kwargs['disttag'] = '.' + subprocess.check_output( + kwargs = dict((f, yumvar_dict[f]) for f in YumVars._fields if f in yumvar_dict) + kwargs['disttag'] = '.' + util.check_output( ['/usr/bin/rpm', '-q', '--qf', '%{RELEASE}\n' , 'kernel']).splitlines()[0].split('.')[-1] get_yum_config._yum_vars = YumVars(**kwargs) |