move rpmdiff to koji lib

builder/kojid

@@ -27,6 +27,7 @@ except ImportError:  # pragma: no cover
     krbV = None
 import koji
 import koji.plugin
+import koji.rpmdiff
 import koji.util
 import koji.tasks
 import glob
@@ -64,9 +65,6 @@ from yum import repoMDObject
 import yum.packages
 import yum.Errors
 
-import imp
-_rpmdiff = imp.load_source('_rpmdiff', '/usr/libexec/koji-hub/rpmdiff')
-
 #imports for LiveCD, LiveMedia, and Appliance handler
 image_enabled = False
 try:
@@ -1256,7 +1254,7 @@ class BuildArchTask(BaseBuildTask):
         for rpmf in rpm_files:
             if rpmf.endswith('.noarch.rpm'):
                 fpath = os.path.join(resultdir, rpmf)
-                d = _rpmdiff.Rpmdiff(fpath, fpath, ignore='S5TN')
+                d = koji.rpmdiff.Rpmdiff(fpath, fpath, ignore='S5TN')
                 rpmdiff_hash[self.id][rpmf] = d.kojihash()
         if rpmdiff_hash[self.id]:
             log_name = 'noarch_rpmdiff.json'

hub/Makefile

@@ -1,6 +1,5 @@
 PYTHON=python
 PACKAGE = $(shell basename `pwd`)
-LIBEXECFILES = rpmdiff
 PYFILES = $(wildcard *.py)
 PYVER := $(shell $(PYTHON) -c 'import sys; print("%.3s" %(sys.version))')
 PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print(sys.prefix)')
@@ -24,7 +23,6 @@ install:
 	fi
 
 	mkdir -p $(DESTDIR)/usr/libexec/koji-hub
-	install -p -m 755 $(LIBEXECFILES) $(DESTDIR)/usr/libexec/koji-hub
 
 	mkdir -p $(DESTDIR)/etc/httpd/conf.d
 	install -p -m 644 httpd.conf $(DESTDIR)/etc/httpd/conf.d/kojihub.conf

hub/kojihub.py

@@ -24,6 +24,7 @@
 
 import base64
 import calendar
+import koji.rpmdiff
 import datetime
 import errno
 import fcntl
@@ -55,13 +56,10 @@ import koji.policy
 import koji.xmlrpcplus
 from koji.context import context
 from koji.util import dslice
-import imp
-_rpmdiff = imp.load_source('_rpmdiff', '/usr/libexec/koji-hub/rpmdiff')
 from koji.util import md5_constructor
 from koji.util import multi_fnmatch
 from koji.util import safer_move
 from koji.util import sha1_constructor
-
 logger = logging.getLogger('koji.hub')
 
 def log_error(msg):
@@ -8379,7 +8377,7 @@ def rpmdiff(basepath, rpmlist, hashes):
         # ignore differences in file size, md5sum, and mtime
         # (files may have been generated at build time and contain
         #  embedded dates or other insignificant differences)
-        d = _rpmdiff.Rpmdiff(os.path.join(basepath, first_rpm),
+        d = koji.rpmdiff.Rpmdiff(os.path.join(basepath, first_rpm),
             os.path.join(basepath, other_rpm), ignore='S5TN')
         if d.differs():
             raise koji.BuildError(

koji.spec

@@ -321,7 +321,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/koji-hub
 %dir %{_libexecdir}/koji-hub
-%{_libexecdir}/koji-hub/rpmdiff
 %config(noreplace) /etc/httpd/conf.d/kojihub.conf
 %dir /etc/koji-hub
 %config(noreplace) /etc/koji-hub/hub.conf