summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/fedpkg.py6
-rw-r--r--src/pyfedpkg/__init__.py4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 5f3219e..2d7fff2 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -449,7 +449,7 @@ def commit(args):
except pyfedpkg.FedpkgError, e:
log.error('coult not create clog: %s' % e)
sys.exit(1)
- args.file = os.path.abspath(self.path.join(args.path, 'clog'))
+ args.file = os.path.abspath(os.path.join(args.path, 'clog'))
try:
pyfedpkg.commit(args.path, args.message, args.file, args.files)
except pyfedpkg.FedpkgError, e:
@@ -459,7 +459,7 @@ def commit(args):
try:
if not mymodule:
mymodule = pyfedpkg.PackageModule(args.path)
- tagname = mymodule.nvr()
+ tagname = mymodule.nvr
pyfedpkg.add_tag(tagname, True, args.message, args.file)
except pyfedpkg.FedpkgError, e:
log.error('Coult not create a tag: %s' % e)
@@ -523,7 +523,7 @@ def import_srpm(args):
sys.exit(1)
# replace this system call with a proper diff target when it is
# readys
- mymodule.diff(cached=True)
+ pyfedpkg.diff(args.path, cached=True)
print('--------------------------------------------')
print("New content staged and new sources uploaded.")
print("Commit if happy or revert with: git reset --hard HEAD")
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 59d65ad..28ca295 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -1288,10 +1288,6 @@ class PackageModule:
# Get just the output, then split it by space, grab the first
return output[0].split()[0]
- def getnvr(self):
- """Return Name-Version-Release of a package"""
- return self.nvr
-
def getrel(self):
"""Return the version-release of a package module."""