From f3425e638040104feb7f65b414b988e0554dbfdf Mon Sep 17 00:00:00 2001 From: "biao716.wang" Date: Tue, 19 Nov 2019 17:59:18 +0800 Subject: [PATCH] fix pylint error for createrepo and update version to 0.10.8 Change-Id: I79bd4cb6f9e31e05eea07f138aa76b06a29f8074 Signed-off-by: biao716.wang --- createrepo/__init__.py | 62 +++++++++++++++++++-------------------- createrepo/deltarpms.py | 2 +- createrepo/utils.py | 2 +- debian/changelog | 6 ++++ debian/control | 2 +- dmd.py | 3 +- modifyrepo.py | 8 ++--- packaging/createrepo.spec | 7 +++-- 8 files changed, 49 insertions(+), 43 deletions(-) diff --git a/createrepo/__init__.py b/createrepo/__init__.py index 9115e1d..e870507 100644 --- a/createrepo/__init__.py +++ b/createrepo/__init__.py @@ -136,7 +136,7 @@ class MetaDataGenerator: self.read_pkgs = [] if not self.conf.directory and not self.conf.directories: - raise MDError, "No directory given on which to run." + raise MDError( "No directory given on which to run.") if not self.conf.directories: # just makes things easier later self.conf.directories = [self.conf.directory] @@ -180,31 +180,31 @@ class MetaDataGenerator: testdir = os.path.join(self.conf.basedir, mydir) if not os.path.exists(testdir): - raise MDError, _('Directory %s must exist') % mydir + raise MDError( _('Directory %s must exist') % mydir) if not os.path.isdir(testdir): - raise MDError, _('%s must be a directory') % mydir + raise MDError( _('%s must be a directory') % mydir) if not os.access(self.conf.outputdir, os.W_OK): - raise MDError, _('Directory %s must be writable.') % self.conf.outputdir + raise MDError( _('Directory %s must be writable.') % self.conf.outputdir) temp_output = os.path.join(self.conf.outputdir, self.conf.tempdir) if not checkAndMakeDir(temp_output): - raise MDError, _('Cannot create/verify %s') % temp_output + raise MDError( _('Cannot create/verify %s') % temp_output) temp_final = os.path.join(self.conf.outputdir, self.conf.finaldir) if not checkAndMakeDir(temp_final): - raise MDError, _('Cannot create/verify %s') % temp_final + raise MDError( _('Cannot create/verify %s') % temp_final) if self.conf.deltas: temp_delta = os.path.join(self.conf.outputdir, self.conf.delta_relative) if not checkAndMakeDir(temp_delta): - raise MDError, _('Cannot create/verify %s') % temp_delta + raise MDError( _('Cannot create/verify %s') % temp_delta) self.conf.deltadir = temp_delta if os.path.exists(os.path.join(self.conf.outputdir, self.conf.olddir)): - raise MDError, _('Old data directory exists, please remove: %s') % self.conf.olddir + raise MDError( _('Old data directory exists, please remove: %s') % self.conf.olddir) # make sure we can write to where we want to write to: # and pickup the mdtimestamps while we're at it @@ -217,7 +217,7 @@ class MetaDataGenerator: direc)) if os.path.exists(filepath): if not os.access(filepath, os.W_OK): - raise MDError, _('error in must be able to write to metadata dir:\n -> %s') % filepath + raise MDError( _('error in must be able to write to metadata dir:\n -> %s') % filepath) if self.conf.checkts: # checking for repodata/repomd.xml - not just the data dir @@ -235,7 +235,7 @@ class MetaDataGenerator: a = os.path.join(self.package_dir, self.conf.groupfile) if not os.path.exists(a): - raise MDError, _('Error: groupfile %s cannot be found.' % a) + raise MDError( _('Error: groupfile %s cannot be found.' % a)) self.conf.groupfile = a @@ -244,7 +244,7 @@ class MetaDataGenerator: if not os.path.isabs(a): a = os.path.join(self.conf.outputdir, a) if not checkAndMakeDir(a): - raise MDError, _('Error: cannot open/write to cache dir %s' % a) + raise MDError( _('Error: cannot open/write to cache dir %s' % a)) self.conf.cachedir = a @@ -371,7 +371,7 @@ class MetaDataGenerator: self.writeMetadataDocs(packages) self.closeMetadataDocs() except (IOError, OSError), e: - raise MDError, _('Cannot access/write repodata files: %s') % e + raise MDError( _('Cannot access/write repodata files: %s') % e) def openMetadataDocs(self): @@ -435,7 +435,7 @@ class MetaDataGenerator: pkgpath = self.package_dir if not rpmfile.strip(): - raise MDError, "Blank filename passed in, skipping" + raise MDError( "Blank filename passed in, skipping") if rpmfile.find("://") != -1: @@ -451,8 +451,8 @@ class MetaDataGenerator: try: rpmfile = self.grabber.urlgrab(rpmfile, dest) except grabber.URLGrabError, e: - raise MDError, "Unable to retrieve remote package %s: %s" % ( - rpmfile, e) + raise MDError ("Unable to retrieve remote package %s: %s" % ( + rpmfile, e)) else: @@ -462,7 +462,7 @@ class MetaDataGenerator: po = yumbased.CreateRepoPackage(self.ts, rpmfile, sumtype=self.conf.sumtype) except Errors.MiscError, e: - raise MDError, "Unable to open package: %s" % e + raise MDError( "Unable to open package: %s" % e) # external info we need po._cachedir = self.conf.cachedir po._baseurl = baseurl @@ -473,8 +473,8 @@ class MetaDataGenerator: self.rpmlib_reqs[r] = 1 if po.checksum in (None, ""): - raise MDError, "No Package ID found for package %s, not going to" \ - " add it" % po + raise MDError( "No Package ID found for package %s, not going to" \ + " add it" % po) return po @@ -682,7 +682,7 @@ class MetaDataGenerator: def _get_old_package_dict(self): if hasattr(self, '_old_package_dict'): - return self._old_package_dict + return self._old_package_dict #pylint: disable=access-member-before-definition self._old_package_dict = {} opl = [] @@ -1003,7 +1003,7 @@ class MetaDataGenerator: except: self.callback.errorlog( _('Error saving temp file for repomd.xml: %s') % repofilepath) - raise MDError, 'Could not save temp file: %s' % repofilepath + raise MDError( 'Could not save temp file: %s' % repofilepath) del repodoc @@ -1020,8 +1020,8 @@ class MetaDataGenerator: try: os.rename(output_final_dir, output_old_dir) except: - raise MDError, _('Error moving final %s to old dir %s' % ( - output_final_dir, output_old_dir)) + raise MDError (_('Error moving final %s to old dir %s' % ( + output_final_dir, output_old_dir))) output_temp_dir = os.path.join(self.conf.outputdir, self.conf.tempdir) @@ -1030,7 +1030,7 @@ class MetaDataGenerator: except: # put the old stuff back os.rename(output_old_dir, output_final_dir) - raise MDError, _('Error moving final metadata into place') + raise MDError( _('Error moving final metadata into place')) for f in ['primaryfile', 'filelistsfile', 'otherfile', 'repomdfile', 'groupfile']: @@ -1044,8 +1044,8 @@ class MetaDataGenerator: try: os.remove(oldfile) except OSError, e: - raise MDError, _( - 'Could not remove old metadata file: %s: %s') % (oldfile, e) + raise MDError( _( + 'Could not remove old metadata file: %s: %s') % (oldfile, e)) # Move everything else back from olddir (eg. repoview files) for f in os.listdir(output_old_dir): @@ -1069,15 +1069,15 @@ class MetaDataGenerator: else: os.remove(oldfile) except OSError, e: - raise MDError, _( - 'Could not remove old metadata file: %s: %s') % (oldfile, e) + raise MDError (_( + 'Could not remove old metadata file: %s: %s') % (oldfile, e)) else: try: os.rename(oldfile, finalfile) except OSError, e: msg = _('Could not restore old non-metadata file: %s -> %s') % (oldfile, finalfile) msg += _('Error was %s') % e - raise MDError, msg + raise MDError( msg) try: os.rmdir(output_old_dir) @@ -1105,8 +1105,8 @@ class MetaDataGenerator: try: self.md_sqlite = MetaDataSqlite(destdir) except sqlite.OperationalError, e: - raise MDError, _('Cannot create sqlite databases: %s.\n'\ - 'Maybe you need to clean up a .repodata dir?') % e + raise MDError( _('Cannot create sqlite databases: %s.\n'\ + 'Maybe you need to clean up a .repodata dir?') % e) @@ -1180,7 +1180,7 @@ class SplitMetaDataGenerator(MetaDataGenerator): self.conf.baseurl = self._getFragmentUrl(self.conf.baseurl, 1) self.closeMetadataDocs() except (IOError, OSError), e: - raise MDError, _('Cannot access/write repodata files: %s') % e + raise MDError( _('Cannot access/write repodata files: %s') % e) diff --git a/createrepo/deltarpms.py b/createrepo/deltarpms.py index 6f3b317..28c6ece 100644 --- a/createrepo/deltarpms.py +++ b/createrepo/deltarpms.py @@ -35,7 +35,7 @@ class DeltaRPMPackage: self.mtime = stats[8] del stats except OSError, e: - raise MDError, "Error Stat'ing file %s%s" % (basedir, filename) + raise MDError( "Error Stat'ing file %s%s" % (basedir, filename)) self.csum_type = 'sha256' self.relativepath = filename self.po = po diff --git a/createrepo/utils.py b/createrepo/utils.py index 3fa077f..df3e93a 100644 --- a/createrepo/utils.py +++ b/createrepo/utils.py @@ -73,7 +73,7 @@ def returnFD(filename): try: fdno = os.open(filename, os.O_RDONLY) except OSError: - raise MDError, "Error opening file" + raise MDError("Error opening file") return fdno def checkAndMakeDir(directory): diff --git a/debian/changelog b/debian/changelog index de0136a..30496cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +createrepo (0.10.8) unstable; urgency=low + + * update to 0.10.8 + + -- Biao Wang Wed, 20 Nov 2019 09:28:48 +0100 + createrepo (0.9.8) unstable; urgency=low * update to 0.9.8 diff --git a/debian/control b/debian/control index 272ddf3..0b3394d 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://linux.duke.edu/projects/metadata/ Package: createrepo Architecture: all -Depends: ${python:Depends}, python-rpm, rpm (>= 4.1.1), python-libxml2, python-sqlitecachec, deltarpm, yum +Depends: ${python:Depends}, python-rpm, rpm (>= 4.1.1), python-lxml, python-libxml2, python-sqlitecachec, deltarpm, yum Description: generates the metadata necessary for a RPM package repository This tool will generates all XML metadata required by a RPM (Redhat Package Manager) package repository. diff --git a/dmd.py b/dmd.py index 684bac6..0e0c3b8 100755 --- a/dmd.py +++ b/dmd.py @@ -19,8 +19,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import sys -from lxml.etree import parse, tostring, Element - +from lxml.etree import parse, tostring, Element #pylint: disable=E0611 class MdType(object): def __init__(self, namespace, rootelem): diff --git a/modifyrepo.py b/modifyrepo.py index 1fd9ea4..cf3fb85 100755 --- a/modifyrepo.py +++ b/modifyrepo.py @@ -38,7 +38,7 @@ class RepoMetadata: self.repomdxml = os.path.join(self.repodir, 'repomd.xml') self.checksum_type = 'sha256' if not os.path.exists(self.repomdxml): - raise MDError, '%s not found' % self.repomdxml + raise MDError('%s not found' % self.repomdxml) self.doc = minidom.parse(self.repomdxml) def _insert_element(self, parent, name, attrs=None, text=None): @@ -60,7 +60,7 @@ class RepoMetadata: """ md = None if not metadata: - raise MDError, 'metadata cannot be None' + raise MDError( 'metadata cannot be None') if isinstance(metadata, minidom.Document): md = metadata.toxml() mdname = 'updateinfo.xml' @@ -74,9 +74,9 @@ class RepoMetadata: oldmd.close() mdname = os.path.basename(metadata) else: - raise MDError, '%s not found' % metadata + raise MDError('%s not found' % metadata) else: - raise MDError, 'invalid metadata type' + raise MDError( 'invalid metadata type') ## Compress the metadata and move it into the repodata if not mdname.endswith('.gz'): diff --git a/packaging/createrepo.spec b/packaging/createrepo.spec index 70f5a5a..43a75c4 100644 --- a/packaging/createrepo.spec +++ b/packaging/createrepo.spec @@ -22,8 +22,8 @@ Name: createrepo BuildRequires: python -Version: 0.9.8 -Release: 10.1 +Version: 0.10.8 +Release: 10.8 License: GPLv2+ Summary: Creates a Common Metadata Repository Group: System/Packages @@ -39,7 +39,8 @@ Requires: yum >= 3.2.23 %endif Requires: rpm >= 4.1.1 Requires: rpm-python -Requires: libxml2-python +Requires: python-libxml2 +Requires: python-lxml %if 0%{?suse_version} > 910 Requires: yum-metadata-parser %endif -- 2.34.1