summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2010-12-01 12:08:33 -0800
committerJesse Keating <jkeating@redhat.com>2010-12-01 12:08:33 -0800
commit69de8ecadf6d93bde3818c5973db871baac6ec2e (patch)
tree4c60a53357bf511c7ddda24a8b1cfb65e5862736
parent999d56be352e2b4b135c2d7681fdf9289562e3ee (diff)
downloadfedora-packager-69de8ecadf6d93bde3818c5973db871baac6ec2e.zip
fedora-packager-69de8ecadf6d93bde3818c5973db871baac6ec2e.tar.gz
fedora-packager-69de8ecadf6d93bde3818c5973db871baac6ec2e.tar.xz
Fix up the commit command
Looks like argparse doesn't like a % in help. Odd. Also fix a logic error for non-tty usage.
-rwxr-xr-xsrc/fedpkg.py2
-rw-r--r--src/pyfedpkg/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 2d7fff2..29c774d 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -949,7 +949,7 @@ packages will be built sequentially.
parser_commit.add_argument('-c', '--clog',
default = False,
action = 'store_true',
- help = 'Generate the commit message from the %Changelog section')
+ help = 'Generate the commit message from the Changelog section')
parser_commit.add_argument('-t', '--tag',
default = False,
action = 'store_true',
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 08ae1b9..8f202b8 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -487,7 +487,7 @@ def commit(path=None, message=None, file=None, files=[]):
# First lets see if we got a message or we're on a real tty:
if not sys.stdin.isatty():
- if not message or not file:
+ if not message and not file:
raise FedpkgError('Must have a commit message or be on a real tty.')
# construct the git command