PR#133: make yum.comps a soft dep - koji

koji

#133 make yum.comps a soft dep

Merged 7 years ago by mikem. Opened 7 years ago by mikem.

https://github.com/mikem23/koji-playground.git comps-soft-dep into master

make yum.comps a soft dep

Mike McLean • 7 years ago

0142f4d

cli/koji

file modified

+9 -2

		`@@ -60,7 +60,10 @@`
		`import urlgrabber.grabber as grabber`
		`import urlgrabber.progress as progress`
		`import xmlrpclib`
		`- import yum.comps`
		`+ try:`
		`+ import yum.comps as yumcomps`
		`+ except ImportError:`
		`+ yumcomps = None`
		`import optparse`
		`#for import-comps handler (currently disabled)`
		`#from rhpl.comps import Comps`
		`@@ -1717,7 +1720,11 @@`
		`if len(args) != 2:`
		`parser.error(_("Incorrect number of arguments"))`
		`assert False`
		`- comps = yum.comps.Comps()`
		`+ if yumcomps is None:`
		`+ print "yum comps module not available"`
		`+ return 1`
		`+ # TODO: port to libcomps`
		`+ comps = yumcomps.Comps()`
		`comps.add(args[0])`
		`tag = args[1]`
		`force = local_options.force`

no initial comment

mikem commented 7 years ago

Only one obscure cli command uses this import, so defer the error until that command is run

ngompa commented 7 years ago

@mikem Why not port this to use python-libcomps?

mikem commented 7 years ago

First things first. There is a TODO for that. I have partial work, but it's a little trickier and folks were complaining about the yum dep. Also, epel6 doesn't appear to have libcomps, so we'd probably still want to fall back to this.

ngompa commented 7 years ago

@mikem It was never submitted to EPEL6, but at one point it was built for it1. If you want to move to it, it can be built and submitted to EPEL6.

mikem commented 7 years ago

Anyway, porting to libcomps is on my radar. Feel free to file an issue for it if you like :smile:, but in the meantime I'm going to pull this in soon unless there are other objections.

ngompa commented 7 years ago

No objections here.

Edited 7 years ago by ngompa

mikem commented 7 years ago

Commit 4250d9a fixes this pull-request