diff options
| -rwxr-xr-x | src/fedpkg.py | 44 | ||||
| -rw-r--r-- | src/pyfedpkg/__init__.py | 26 |
2 files changed, 34 insertions, 36 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py index 06dbf17..ce99eea 100755 --- a/src/fedpkg.py +++ b/src/fedpkg.py @@ -299,7 +299,7 @@ def build(args, sets=False): user = getuser(args.user) # Need to do something with BUILD_FLAGS or KOJI_FLAGS here for compat try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: # This error needs a better print out log.error('Could not use module: %s' % e) @@ -352,7 +352,7 @@ def build(args, sets=False): def chainbuild(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: log.error('Could not use module %s' % e) sys.exit(1) @@ -438,7 +438,7 @@ def clean(args): def clog(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.clog() except pyfedpkg.FedpkgError, e: log.error('Could not generate clog: %s' % e) @@ -463,7 +463,7 @@ def commit(args): mymodule = None if args.clog: try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) mymodule.clog() except pyfedpkg.FedpkgError, e: log.error('coult not create clog: %s' % e) @@ -477,7 +477,7 @@ def commit(args): if args.tag: try: if not mymodule: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) tagname = mymodule.nvr pyfedpkg.add_tag(tagname, True, args.message, args.file) except pyfedpkg.FedpkgError, e: @@ -494,7 +494,7 @@ def compile(args): if args.short_circuit: short = True try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.compile(arch=arch, short=short) except pyfedpkg.FedpkgError, e: log.error('Could not compile: %s' % e) @@ -513,7 +513,7 @@ def export(args): def gimmespec(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) print(mymodule.spec) except pyfedpkg.FedpkgError, e: log.error('Could not get spec file: %s' % e) @@ -521,7 +521,7 @@ def gimmespec(args): def giturl(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) print(mymodule.giturl()) except pyfedpkg.FedpkgError, e: log.error('Could not get the giturl: %s' % e) @@ -535,7 +535,7 @@ def import_srpm(args): if not args.create: try: uploadfiles = pyfedpkg.import_srpm(args.srpm, path=args.path) - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) mymodule.upload(uploadfiles, replace=True) except pyfedpkg.FedpkgError, e: log.error('Could not import srpm: %s' % e) @@ -556,7 +556,7 @@ def install(args): if args.short_circuit: short = True try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.install(arch=arch, short=short) except pyfedpkg.FedpkgError, e: log.error('Could not install: %s' % e) @@ -564,7 +564,7 @@ def install(args): def lint(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.lint(args.info) except pyfedpkg.FedpkgError, e: log.error('Could not run rpmlint: %s' % e) @@ -575,7 +575,7 @@ def local(args): if args.arch: arch = args.arch try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) if args.md5: return mymodule.local(arch=arch, hashtype='md5') else: @@ -599,7 +599,7 @@ def mockbuild(args): # there were no args pass try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.mockbuild(mockargs) except pyfedpkg.FedpkgError, e: log.error('Could not run mockbuild: %s' % e) @@ -619,7 +619,7 @@ def new_sources(args): log.error('File does not exist: %s' % file) sys.exit(1) try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) mymodule.upload(args.files, replace=args.replace) except pyfedpkg.FedpkgError, e: log.error('Could not upload new sources: %s' % e) @@ -635,7 +635,7 @@ def prep(args): if args.arch: arch = args.arch try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.prep(arch=arch) except pyfedpkg.FedpkgError, e: log.error('Could not prep: %s' % e) @@ -679,7 +679,7 @@ def sources(args): def srpm(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) pyfedpkg.sources(args.path) if args.md5: mymodule.srpm('md5') @@ -728,7 +728,7 @@ def tag(args): tagname = args.tag try: if not tagname or args.clog: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) if not tagname: tagname = mymodule.nvr if clog: @@ -747,7 +747,7 @@ def tagrequest(args): args.desc = raw_input('\nAdd a description to your request: ') try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) ticket = mymodule.new_ticket(user, passasswd, args.desc, args.build) print('Ticket #%s filed successfully' % ticket) except pyfedpkg.FedpkgError, e: @@ -760,7 +760,7 @@ def unusedfedpatches(args): def unusedpatches(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) unused = mymodule.unused_patches() except pyfedpkg.FedpkgError, e: log.error('Could not get unused patches: %s' % e) @@ -771,7 +771,7 @@ def update(args): """Submit a new update to bodhi""" user = getuser(args.user) try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) except pyfedpkg.FedpkgError, e: log.error('Could not use module: %s' % e) sys.exit(1) @@ -849,7 +849,7 @@ def update(args): def verify_files(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + mymodule = pyfedpkg.PackageModule(args) return mymodule.verify_files() except pyfedpkg.FedpkgError, e: log.error('Could not verify %%files list: %s' % e) @@ -857,7 +857,7 @@ def verify_files(args): def verrel(args): try: - mymodule = pyfedpkg.PackageModule(args.path, args.dist) + 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 c130864..92bc7df 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -1134,13 +1134,11 @@ class PackageModule: return subprocess.Popen(['rpm --eval %{_arch}'], shell=True, stdout=subprocess.PIPE).communicate()[0].strip('\n') - def __init__(self, path=None, dist=None): + def __init__(self, args): # Initiate a PackageModule object in a given path # Set some global variables used throughout - if not path: - path = os.getcwd() - log.debug('Creating module object from %s' % path) - self.path = path + log.debug('Creating module object from %s' % args.path) + self.path = args.path self.lookaside = LOOKASIDE self.lookasidehash = LOOKASIDEHASH self.spec = self.gimmespec() @@ -1153,13 +1151,13 @@ class PackageModule: self.anonkojisession = 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 - if dist: - self.branch = dist + if args.dist: + self.branch = args.dist else: self.branch = self._findbranch() if self.branch.startswith('f'): @@ -1192,11 +1190,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] |