From 5267b75c3144d4041da6d762c826b276d342bac7 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 13 Aug 2012 18:13:50 -0400 Subject: [PATCH] cover all of the edge cases with and without yum-utils installed. it is possible those folks w/o yum-utils installed but with rhn-plugin installed but w/o any rhn-certificates will still see an error msg. they have 3 options: 1. remove rhn-plugin 2. enable some channels w/rhn certs 3. install yum-utils --- yum | 305 +++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 179 insertions(+), 126 deletions(-) diff --git a/yum b/yum index ea190568f06..ff665a98c6d 100755 --- a/yum +++ b/yum @@ -23,41 +23,150 @@ import traceback import os +import yum + def_qf = "%{name}-%{version}-%{release}.%{arch}" repoquery='/usr/bin/repoquery' +if not os.path.exists(repoquery): + repoquery = None yumbin='/usr/bin/yum' -rpmbin = '/bin/rpm' -def is_installed(repoq, pkgspec, qf=def_qf): - cmd = repoq + ["--disablerepo=*", "--pkgnarrow=installed", "--qf", qf, pkgspec] - rc,out,err = run(cmd) - if rc == 0: - return [ p for p in out.split('\n') if p.strip() ] + +def yum_base(conf_file=None, cachedir=False): + my = yum.YumBase() + my.preconf.debuglevel=0 + my.preconf.errorlevel=0 + if conf_file and os.path.exists(conf_file): + my.preconf.fn = conf_file + if cachedir or os.geteuid() != 0: + if hasattr(my, 'setCacheDir'): + my.setCacheDir() + else: + cachedir = yum.misc.getCacheDir() + my.repos.setCacheDir(cachedir) + my.conf.cache = 0 + + return my + +def po_to_nevra(po): + if hasattr(po, 'ui_nevra'): + return po.ui_nevra + else: + return '%s-%s-%s.%s' % (po.name, po.version, po.release, po.arch) + + + +def is_installed(module, repoq, pkgspec, conf_file, qf=def_qf): + if not repoq: + pkgs = [] + try: + my = yum_base(conf_file) + e,m,u = my.rpmdb.matchPackageNames([pkgspec]) + pkgs = e + m + if not pkgs: + pkgs.extend(my.returnInstalledPackagesByDep(pkgspec)) + except Exception, e: + module.fail_json(msg="Failure talking to yum: %s" % e) + + return [ po_to_nevra(p) for p in pkgs ] + else: + cmd = repoq + ["--disablerepo=*", "--pkgnarrow=installed", "--qf", qf, pkgspec] + rc,out,err = run(cmd) + cmd = repoq + ["--disablerepo=*", "--pkgnarrow=installed", "--qf", qf, "--whatprovides", pkgspec] + rc2,out2,err2 = run(cmd) + if rc == 0 and rc2 == 0: + out += out2 + return [ p for p in out.split('\n') if p.strip() ] + else: + module.fail_json(msg='Error from repoquery: %s' % err + err2) + return [] -def is_available(repoq, pkgspec, qf=def_qf): - cmd = repoq + ["--qf", qf, pkgspec] - rc,out,err = run(cmd) - if rc == 0: - return [ p for p in out.split('\n') if p.strip() ] +def is_available(module, repoq, pkgspec, conf_file, qf=def_qf): + if not repoq: + pkgs = [] + try: + my = yum_base(conf_file) + e,m,u = my.pkgSack.matchPackageNames([pkgspec]) + pkgs = e + m + if not pkgs: + pkgs.extend(my.returnPackagesByDep(pkgspec)) + except Exception, e: + module.fail_json(msg="Failure talking to yum: %s" % e) + + return [ po_to_nevra(p) for p in pkgs ] + else: + cmd = repoq + ["--qf", qf, pkgspec] + rc,out,err = run(cmd) + if rc == 0: + return [ p for p in out.split('\n') if p.strip() ] + else: + module.fail_json(msg='Error from repoquery: %s' % err) + return [] -def is_update(repoq, pkgspec, qf=def_qf): - cmd = repoq + ["--pkgnarrow=updates", "--qf", qf, pkgspec] - rc,out,err = run(cmd) - if rc == 0: - return set([ p for p in out.split('\n') if p.strip() ]) +def is_update(module, repoq, pkgspec, conf_file, qf=def_qf): + if not repoq: + retpkgs = [] + pkgs = [] + updates = [] + try: + my = yum_base(conf_file) + pkgs = my.returnPackagesByDep(pkgspec) + my.returnInstalledPackagesByDep(pkgspec) + if not pkgs: + e,m,u = my.pkgSack.matchPackageNames([pkgspec]) + pkgs = e + m + updates = my.doPackageLists(pkgnarrow='updates').updates + except Exception, e: + module.fail_json(msg="Failure talking to yum: %s" % e) + + for pkg in pkgs: + if pkg in updates: + retpkgs.append(pkg) + + return set([ po_to_nevra(p) for p in retpkgs ]) + else: + cmd = repoq + ["--pkgnarrow=updates", "--qf", qf, pkgspec] + rc,out,err = run(cmd) + + if rc == 0: + return set([ p for p in out.split('\n') if p.strip() ]) + else: + module.fail_json(msg='Error from repoquery: %s' % err) + return [] -def what_provides(repoq, req_spec, qf=def_qf): - cmd = repoq + ["--qf", qf, "--whatprovides", req_spec] - rc,out,err = run(cmd) - ret = [] - if rc == 0: - ret = set([ p for p in out.split('\n') if p.strip() ]) - return ret +def what_provides(module, repoq, req_spec, conf_file, qf=def_qf): + if not repoq: + pkgs = [] + try: + my = yum_base(conf_file) + pkgs = my.returnPackagesByDep(req_spec) + my.returnInstalledPackagesByDep(req_spec) + if not pkgs: + e,m,u = my.pkgSack.matchPackageNames([req_spec]) + pkgs.extend(e) + pkgs.extend(m) + e,m,u = my.rpmdb.matchPackageNames([req_spec]) + pkgs.extend(e) + pkgs.extend(m) + except Exception, e: + module.fail_json(msg="Failure talking to yum: %s" % e) + + return set([ po_to_nevra(p) for p in pkgs ]) + else: + cmd = repoq + ["--qf", qf, "--whatprovides", req_spec] + rc,out,err = run(cmd) + cmd = repoq + ["--qf", qf, req_spec] + rc2,out2,err2 = run(cmd) + if rc == 0 and rc2 == 0: + out += out2 + return set([ p for p in out.split('\n') if p.strip() ]) + else: + module.fail_json(msg='Error from repoquery: %s' % err + err2) + + return [] def pkg_to_dict(pkgstr): if pkgstr.strip(): @@ -90,22 +199,22 @@ def repolist(repoq, qf="%{repoid}"): ret = set([ p for p in out.split('\n') if p.strip() ]) return ret -def list_stuff(conf_file, stuff): +def list_stuff(module, conf_file, stuff): qf = "%{name}|%{epoch}|%{version}|%{release}|%{arch}|%{repoid}" repoq = [repoquery, '--show-duplicates', '--plugins', '--quiet', '-q'] if conf_file and os.path.exists(conf_file): repoq += ['-c', conf_file] if stuff == 'installed': - return [ pkg_to_dict(p) for p in is_installed(repoq, '-a', qf=qf) if p.strip() ] + return [ pkg_to_dict(p) for p in is_installed(module, repoq, '-a', conf_file, qf=qf) if p.strip() ] elif stuff == 'updates': - return [ pkg_to_dict(p) for p in is_update(repoq, '-a', qf=qf) if p.strip() ] + return [ pkg_to_dict(p) for p in is_update(module, repoq, '-a', conf_file, qf=qf) if p.strip() ] elif stuff == 'available': - return [ pkg_to_dict(p) for p in is_available(repoq, '-a', qf=qf) if p.strip() ] + return [ pkg_to_dict(p) for p in is_available(module, repoq, '-a', conf_file, qf=qf) if p.strip() ] elif stuff == 'repos': return [ dict(repoid=name, state='enabled') for name in repolist(repoq) if name.strip() ] else: - return [ pkg_to_dict(p) for p in is_installed(repoq, stuff, qf=qf) + is_available(repoq, stuff, qf=qf) if p.strip() ] + return [ pkg_to_dict(p) for p in is_installed(module, repoq, stuff, conf_file, qf=qf) + is_available(module, repoq, stuff, conf_file, qf=qf) if p.strip() ] def run(command): try: @@ -129,61 +238,8 @@ def run(command): return rc, out, err -def install_no_repoq(module, items, yum_basecmd, latest=False): - res = {'changed': False} - to_install = [] - if not latest: - for item in items: - rc, out, err = run([rpmbin, "-q", "--whatprovides", item]) - if rc != 0: - to_install.append(item) - if len(to_install) > 0: - res['changed'] = True - else: - cmd = yum_basecmd + ["check-update"] + items - rc, out, err = run(cmd) - if rc == 100: - res['changed'] = True - to_install = items - elif rc != 0: - module.fail_json(msg=err) - - if len(to_install) > 0: - rc, out, err = run(yum_basecmd + ["--obsoletes", "install"] + to_install) - if rc != 0: - module.fail_json(msg=err) - for item in to_install: - rc, out, err = run([rpmbin, "-q", "--whatprovides", item]) - if rc != 0: - module.fail_json(msg="%s could not be installed" % item) - - module.exit_json(**res) - -def remove_no_repoq(module, items, yum_basecmd): - res = {'changed': False} - - to_remove = [] - for item in items: - rc, out, err = run([rpmbin, "-q", "--whatprovides", "--qf", "%{NAME}\n", item]) - if rc == 0: - to_remove.append(out.strip()) - if len(to_remove) > 0: - res['changed'] = True - rc, out, err = run(yum_basecmd + ["remove"] + to_remove) - if rc != 0: - module.fail_json(msg=err) - res['out'] = out - res['err'] = err - for item in to_remove: - rc, out, err = run([rpmbin, "-q", item]) - if rc == 0: - module.fail_json(msg="%s was not removed" % item) - - module.exit_json(**res) - - -def install(module, items, repoq, yum_basecmd): +def install(module, items, repoq, yum_basecmd, conf_file): res = {} res['results'] = [] res['msg'] = '' @@ -199,7 +255,7 @@ def install(module, items, repoq, yum_basecmd): # get the pkg name-v-r.arch nvra = local_nvra(spec) # look for them in the rpmdb - if is_installed(repoq, nvra): + if is_installed(repoq, nvra, conf_file): # if they are there, skip it continue pkg = spec @@ -211,7 +267,7 @@ def install(module, items, repoq, yum_basecmd): # range requires or file-requires or pkgname :( else: # look up what pkgs provide this - pkglist = what_provides(repoq, spec) + pkglist = what_provides(module, repoq, spec, conf_file) if not pkglist: res['msg'] += "No Package matching '%s' found available, installed or updated" % spec res['failed'] = True @@ -222,7 +278,7 @@ def install(module, items, repoq, yum_basecmd): found = False for this in pkglist: - if is_installed(repoq, this): + if is_installed(module, repoq, this, conf_file): found = True res['results'].append('%s providing %s is already installed' % (this, spec)) @@ -252,7 +308,7 @@ def install(module, items, repoq, yum_basecmd): module.exit_json(**res) -def remove(module, items, repoq, yum_basecmd): +def remove(module, items, repoq, yum_basecmd, conf_file): res = {} res['results'] = [] res['msg'] = '' @@ -267,15 +323,15 @@ def remove(module, items, repoq, yum_basecmd): pkg = spec # req or pkgname remove else: - pkglist = what_provides(repoq, spec) + pkglist = is_installed(module, repoq, spec, conf_file) if not pkglist: - res['msg'] += "No Package matching '%s' found available, installed or updated" % spec + res['msg'] += "No Package matching '%s' found installed" % spec res['failed']=True module.exit_json(**res) found = False for this in pkglist: - if is_installed(repoq, this): + if is_installed(module, repoq, this, conf_file): found = True if not found: @@ -302,7 +358,7 @@ def remove(module, items, repoq, yum_basecmd): module.exit_json(**res) -def latest(module, items, repoq, yum_basecmd): +def latest(module, items, repoq, yum_basecmd, conf_file): res = {} res['results'] = [] res['msg'] = '' @@ -317,30 +373,31 @@ def latest(module, items, repoq, yum_basecmd): pkg = spec # dep/pkgname - find it else: - pkglist = what_provides(repoq, spec) + if is_installed(module, repoq, spec, conf_file): + basecmd = 'update' + else: + basecmd = 'install' + + pkglist = what_provides(module, repoq, spec, conf_file) if not pkglist: res['msg'] += "No Package matching '%s' found available, installed or updated" % spec res['failed']=True module.exit_json(**res) - found = False - nothing_to_do = False - can_be_installed = True + + nothing_to_do = True for this in pkglist: - if is_installed(repoq, this): - if is_update(repoq, this): - found = True - else: - nothing_to_do = True - + if basecmd == 'install' and is_available(module, repoq, this, conf_file): + nothing_to_do = False + break + + if basecmd == 'update' and is_update(module, repoq, this, conf_file): + nothing_to_do = False + break + if nothing_to_do: res['results'].append("All packages providing %s are up to date" % spec) continue - if not found: - basecmd = 'install' - else: - basecmd = 'update' - pkg = spec @@ -376,27 +433,23 @@ def ensure(module, state, pkgspec, conf_file): items = pkgspec.split(',') yum_basecmd = [yumbin, '-d', '1', '-y'] - repoq = [repoquery, '--show-duplicates', '--plugins', '--quiet', '-q'] + if not repoquery: + repoq = None + else: + repoq = [repoquery, '--show-duplicates', '--plugins', '--quiet', '-q'] if conf_file and os.path.exists(conf_file): yum_basecmd += ['-c', conf_file] - repoq += ['-c', conf_file] + if repoq: + repoq += ['-c', conf_file] + + + if state in ['installed', 'present']: + install(module, items, repoq, yum_basecmd, conf_file) + elif state in ['removed', 'absent']: + remove(module, items, repoq, yum_basecmd, conf_file) + elif state == 'latest': + latest(module, items, repoq, yum_basecmd, conf_file) - if os.path.exists(repoquery): - if state in ['installed', 'present']: - install(module, items, repoq, yum_basecmd) - elif state in ['removed', 'absent']: - remove(module, items, repoq, yum_basecmd) - elif state == 'latest': - latest(module, items, repoq, yum_basecmd) - else: - if len(filter(lambda x: x.find('>') != -1 or x.find('<') != -1 or x.find('=') != -1, items)) > 0: - module.fail_json(msg="%s is required to use yum equality comparisons. Please install the yum-utils package." % repoquery) - if state in ['installed', 'present']: - install_no_repoq(module, items, yum_basecmd) - elif state in ['removed', 'absent']: - remove_no_repoq(module, items, yum_basecmd) - elif state == 'latest': - install_no_repoq(module, items, yum_basecmd, latest=True) # should be caught by AnsibleModule argument_spec return dict(changed=False, failed=True, results='', errors='unexpected state') @@ -428,9 +481,9 @@ def main(): params = module.params if params['list']: - if not os.path.exists(repoquery): - module.fail_json(msg="%s is required to use list= with this module. Please install the yum-utils package." % repoquery) - results = dict(results=list_stuff(params['conf_file'], params['list'])) + if not repoquery: + module.fail_json(msg="repoquery is required to use list= with this module. Please install the yum-utils package.") + results = dict(results=list_stuff(module, params['conf_file'], params['list'])) module.exit_json(**results) else: