]> git.michaelhowe.org Git - packages/b/bup.git/commitdiff
toplevel exit() doesn't work in python 2.4.
authorAvery Pennarun <apenwarr@gmail.com>
Sun, 24 Jan 2010 23:17:57 +0000 (18:17 -0500)
committerAvery Pennarun <apenwarr@gmail.com>
Sun, 24 Jan 2010 23:17:57 +0000 (18:17 -0500)
Use sys.exit() instead.

bup.py
cmd-index.py
git.py
options.py

diff --git a/bup.py b/bup.py
index d5b5c767df98ab8eb5cae1027de2577c3e3006a0..e88b7b46e3a09ea9eae299611e57b0946c12ee3b 100755 (executable)
--- a/bup.py
+++ b/bup.py
@@ -14,7 +14,7 @@ def usage():
     for c in os.listdir(exepath):
         if c.startswith('bup-') and c.find('.') < 0:
             log('\t%s\n' % c[4:])
-    exit(99)
+    sys.exit(99)
 
 if len(argv) < 2 or not argv[1] or argv[1][0] == '-':
     usage()
@@ -33,4 +33,4 @@ try:
     os.execv(subpath, [subpath] + argv[2:])
 except OSError, e:
     log('%s: %s\n' % (subpath, e))
-    exit(98)
+    sys.exit(98)
index 1d53f8e431d4afe443aaf182740ce06f84845fb8..1931634a123f07e62b42aa6ef1989d7a1a19c793 100755 (executable)
@@ -240,4 +240,4 @@ if opt['print'] or opt.status or opt.modified:
 
 if saved_errors:
     log('WARNING: %d errors encountered.\n' % len(saved_errors))
-    exit(1)
+    sys.exit(1)
diff --git a/git.py b/git.py
index c8804d3e9805c20d2d96ec6a1a8c61e058b2cdef..2839abb7404c85cf3408cae539159307e71bcaf8 100644 (file)
--- a/git.py
+++ b/git.py
@@ -446,7 +446,7 @@ def check_repo_or_die(path=None):
             init_repo()
         else:
             log('error: %r is not a bup/git repository\n' % repo())
-            exit(15)
+            sys.exit(15)
 
 
 def _treeparse(buf):
index 54ce8af15e7af2159184e3feec2248295bc31f74..ace93b2595b0388fff396c2e279452a5752ce36b 100644 (file)
@@ -77,7 +77,7 @@ class Options:
     
     def usage(self):
         log(self._usagestr)
-        exit(97)
+        sys.exit(97)
         
     def parse(self, args):
         try: