diff options
-rwxr-xr-x | src/fedpkg.py | 42 | ||||
-rw-r--r-- | src/pyfedpkg/__init__.py | 24 |
2 files changed, 33 insertions, 33 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py index 3f5dd59..cacbf23 100755 --- a/src/fedpkg.py +++ b/src/fedpkg.py @@ -295,7 +295,7 @@ def build(args): user = getuser(args.user) # Need to do something with BUILD_FLAGS or KOJI_FLAGS here for compat try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: # This error needs a better print out log.error('Could not use module: %s' % e) @@ -347,7 +347,7 @@ def build(args): def chainbuild(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: log.error('Could not use module %s' % e) sys.exit(1) @@ -429,7 +429,7 @@ def clean(args): def clog(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.clog() except pyfedpkg.FedpkgError, e: log.error('Could not generate clog: %s' % e) @@ -456,7 +456,7 @@ def commit(args): mymodule = None if args.clog: try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) mymodule.clog() except pyfedpkg.FedpkgError, e: log.error('coult not create clog: %s' % e) @@ -470,7 +470,7 @@ def commit(args): if args.tag: try: if not mymodule: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) tagname = mymodule.nvr pyfedpkg.add_tag(tagname, True, args.message, args.file) except pyfedpkg.FedpkgError, e: @@ -487,7 +487,7 @@ def compile(args): if args.short_circuit: short = True try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.compile(arch=arch, short=short) except pyfedpkg.FedpkgError, e: log.error('Could not compile: %s' % e) @@ -506,7 +506,7 @@ def export(args): def gimmespec(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) print(mymodule.spec) except pyfedpkg.FedpkgError, e: log.error('Could not get spec file: %s' % e) @@ -514,7 +514,7 @@ def gimmespec(args): def giturl(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) print(mymodule.giturl()) except pyfedpkg.FedpkgError, e: log.error('Could not get the giturl: %s' % e) @@ -528,7 +528,7 @@ def import_srpm(args): if not args.create: try: uploadfiles = pyfedpkg.import_srpm(args.srpm, path=args.path) - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) mymodule.upload(uploadfiles, replace=True) except pyfedpkg.FedpkgError, e: log.error('Could not import srpm: %s' % e) @@ -549,7 +549,7 @@ def install(args): if args.short_circuit: short = True try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.install(arch=arch, short=short) except pyfedpkg.FedpkgError, e: log.error('Could not install: %s' % e) @@ -557,7 +557,7 @@ def install(args): def lint(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.lint(args.info) except pyfedpkg.FedpkgError, e: log.error('Could not run rpmlint: %s' % e) @@ -568,7 +568,7 @@ def local(args): if args.arch: arch = args.arch try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.local(arch=arch, hashtype=args.hashtype) except pyfedpkg.FedpkgError, e: log.error('Could not build locally: %s' % e) @@ -583,7 +583,7 @@ def mockbuild(args): # there were no args pass try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.mockbuild(mockargs) except pyfedpkg.FedpkgError, e: log.error('Could not run mockbuild: %s' % e) @@ -603,7 +603,7 @@ def new_sources(args): log.error('File does not exist: %s' % file) sys.exit(1) try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) mymodule.upload(args.files, replace=args.replace) except pyfedpkg.FedpkgError, e: log.error('Could not upload new sources: %s' % e) @@ -619,7 +619,7 @@ def prep(args): if args.arch: arch = args.arch try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) return mymodule.prep(arch=arch) except pyfedpkg.FedpkgError, e: log.error('Could not prep: %s' % e) @@ -663,7 +663,7 @@ def sources(args): def srpm(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) pyfedpkg.sources(args.path) mymodule.srpm(hashtype=args.hashtype) except pyfedpkg.FedpkgError, e: @@ -709,7 +709,7 @@ def tag(args): tagname = args.tag try: if not tagname or args.clog: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) if not tagname: tagname = mymodule.nvr if clog: @@ -728,7 +728,7 @@ def tagrequest(args): args.desc = raw_input('\nAdd a description to your request: ') try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) mymodule.new_ticket(user, passwd, args.desc, args.build) except pyfedpkg.FedpkgError, e: print('Could not request a tag release: %s' % e) @@ -740,7 +740,7 @@ def unusedfedpatches(args): def unusedpatches(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) unused = mymodule.unused_patches() except pyfedpkg.FedpkgError, e: log.error('Could not get unused patches: %s' % e) @@ -751,7 +751,7 @@ def update(args): """Submit a new update to bodhi""" user = getuser(args.user) try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: log.error('Could not use module: %s' % e) sys.exit(1) @@ -840,7 +840,7 @@ def local_init(args): def verrel(args): try: - mymodule = pyfedpkg.PackageModule(args.path) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: log.error('Could not get ver-rel: %s' % e) sys.exit(1) diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index d916454..71896d9 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -1048,13 +1048,13 @@ class PackageModule: return subprocess.Popen(['rpm --eval %{_arch}'], shell=True, stdout=subprocess.PIPE).communicate()[0].strip('\n') - def __init__(self, path): + def __init__(self, args): # Initiate a PackageModule object in a given path # Set some global variables used throughout - log.debug('Creating module object from %s' % path) - if not os.path.isdir(path): - raise FedpkgError('Module directory not found: %s' % path) - self.path = path + log.debug('Creating module object from %s' % args.path) + if not os.path.isdir(args.path): + raise FedpkgError('Module directory not found: %s' % args.path) + self.path = args.path self.lookaside = LOOKASIDE self.lookasidehash = LOOKASIDEHASH self.spec = self.gimmespec() @@ -1066,9 +1066,9 @@ class PackageModule: self.kojisession = None # Setup the repo try: - self.repo = git.Repo(path) + self.repo = git.Repo(self.path) except git.errors.InvalidGitRepositoryError: - raise FedpkgError('%s is not a valid repo' % path) + raise FedpkgError('%s is not a valid repo' % self.path) # Find the branch and set things based from that # Still requires a 'branch' file in each branch self.branch = self._findbranch() @@ -1102,11 +1102,11 @@ class PackageModule: self.target = 'dist-rawhide' self.mockconfig = 'fedora-devel-%s' % self.localarch self.override = None - self.rpmdefines = ["--define '_sourcedir %s'" % path, - "--define '_specdir %s'" % path, - "--define '_builddir %s'" % path, - "--define '_srcrpmdir %s'" % path, - "--define '_rpmdir %s'" % path, + self.rpmdefines = ["--define '_sourcedir %s'" % self.path, + "--define '_specdir %s'" % self.path, + "--define '_builddir %s'" % self.path, + "--define '_srcrpmdir %s'" % self.path, + "--define '_rpmdir %s'" % self.path, "--define 'dist .%s'" % self.dist, "--define '%s %s'" % (self.distvar, self.distval), "--define '%s 1'" % self.dist] |