From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 11/16] contrib/fast-import/import-zips.py: fix broken error message
Date: Sat, 23 Feb 2013 16:50:19 -0800 [thread overview]
Message-ID: <1361667024-49776-12-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1361667024-49776-11-git-send-email-davvid@gmail.com>
The 'sys' module is not imported but all of the bits
we want from it are. Adjust the script to not fail
when run on old Python versions and fix the inconsistent
use of tabs.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
contrib/fast-import/import-zips.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py
index f54c65b..b528798 100755
--- a/contrib/fast-import/import-zips.py
+++ b/contrib/fast-import/import-zips.py
@@ -14,9 +14,9 @@ from time import mktime
from zipfile import ZipFile
if hexversion < 0x01060000:
- # The limiter is the zipfile module
- sys.stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
- sys.exit(1)
+ # The limiter is the zipfile module
+ stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
+ exit(1)
if len(argv) < 2:
print 'usage:', argv[0], '<zipfile>...'
--
1.8.2.rc0.263.g20d9441
next prev parent reply other threads:[~2013-02-24 0:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-24 0:50 [PATCH v2 00/16] use a lowercase "usage:" string David Aguilar
2013-02-24 0:50 ` [PATCH v2 01/16] git-sh-setup: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 02/16] git-svn: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 03/16] git-relink: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 04/16] git-merge-one-file: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 05/16] git-archimport: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 06/16] git-cvsexportcommit: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 07/16] git-cvsimport: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 08/16] " David Aguilar
2013-02-24 0:50 ` [PATCH v2 09/16] contrib/credential: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 10/16] contrib/fast-import: " David Aguilar
2013-02-24 0:50 ` David Aguilar [this message]
2013-02-24 0:50 ` [PATCH v2 12/16] contrib/fast-import/import-zips.py: use spaces instead of tabs David Aguilar
2013-02-24 0:50 ` [PATCH v2 13/16] contrib/examples: use a lowercase "usage:" string David Aguilar
2013-02-24 0:50 ` [PATCH v2 14/16] contrib/hooks/setgitperms.perl: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 15/16] templates/hooks--update.sample: " David Aguilar
2013-02-24 0:50 ` [PATCH v2 16/16] Documentation/user-manual.txt: " David Aguilar
2013-02-24 21:45 ` [PATCH v2 00/16] " Junio C Hamano
2013-02-24 22:32 ` David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361667024-49776-12-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).