new file mode 100644

@@ -0,0 +1,16 @@

+# patterned on /usr/include/sysexits.h

+

+EX_OK         = 0

+EX_GENERAL    = 1

+EX_SOMEFAILED = 2    # some parts of the command succeeded, while others failed

+EX_USAGE      = 64   # The command was used incorrectly (e.g. bad command line syntax)

+EX_SOFTWARE   = 70   # internal software error (e.g. S3 error of unknown specificity)

+EX_OSERR      = 71   # system error (e.g. out of memory)

+EX_OSFILE     = 72   # OS error (e.g. invalid Python version)

+EX_IOERR      = 74   # An error occurred while doing I/O on some file.

+EX_TEMPFAIL   = 75   # temporary failure (S3DownloadError or similar, retry later)

+EX_NOPERM     = 77   # Insufficient permissions to perform the operation on S3  

+EX_CONFIG     = 78   # Configuration file error

+_EX_SIGNAL    = 128

+_EX_SIGINT    = 2

+EX_BREAK      = _EX_SIGNAL + _EX_SIGINT # Control-C (KeyboardInterrupt raised)

@@ -18,6 +18,7 @@ import errno

 import urllib

 from calendar import timegm

 from logging import debug, info, warning, error

+from ExitCodes import EX_OSFILE

 try:

     import dateutil.parser

 except ImportError:

@@ -33,7 +34,7 @@ $ pip install python-dateutil

 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

 """)

     sys.stderr.flush()

-    sys.exit(1)

+    sys.exit(EX_OSFILE)

 import Config

 import Exceptions

@@ -15,6 +15,7 @@ import locale

 import getpass

 import S3.Exceptions

 import S3.Config

+from S3.ExitCodes import *

 count_pass = 0

 count_fail = 0

@@ -290,7 +291,7 @@ test_s3cmd("Create multiple buckets", ['mb', pbucket(2), pbucket(3)],

 ## ====== Invalid bucket name

 test_s3cmd("Invalid bucket name", ["mb", "--bucket-location=EU", pbucket('EU')],

-    retcode = 1,

+    retcode = EX_USAGE,

     must_find = "ERROR: Parameter problem: Bucket name '%s' contains disallowed character" % bucket('EU'),

     must_not_find_re = "Bucket.*created")

@@ -421,7 +422,7 @@ test_s3cmd("Rename within S3", ['mv', '%s/xyz/etc/logo.png' % pbucket(1), '%s/xy

 ## ====== Rename (NoSuchKey)

 test_s3cmd("Rename (NoSuchKey)", ['mv', '%s/xyz/etc/logo.png' % pbucket(1), '%s/xyz/etc2/Logo.PNG' % pbucket(1)],

-    retcode = 1,

+    retcode = EX_SOFTWARE,

     must_find_re = [ 'ERROR:.*NoSuchKey' ],

     must_not_find = [ 'File %s/xyz/etc/logo.png moved to %s/xyz/etc2/Logo.PNG' % (pbucket(1), pbucket(1)) ])

@@ -443,7 +444,7 @@ test_rmdir("Remove dst dir for get", "testsuite-out")

 ## ====== Get multiple files

 test_s3cmd("Get multiple files", ['get', '%s/xyz/etc2/Logo.PNG' % pbucket(1), '%s/xyz/etc/AtomicClockRadio.ttf' % pbucket(1), 'testsuite-out'],

-    retcode = 1,

+    retcode = EX_USAGE,

     must_find = [ 'Destination must be a directory or stdout when downloading multiple sources.' ])

 ## ====== put/get non-ASCII filenames

@@ -22,7 +22,7 @@ import sys

 if float("%d.%d" %(sys.version_info[0], sys.version_info[1])) < 2.4:

     sys.stderr.write(u"ERROR: Python 2.4 or higher required, sorry.\n")

-    sys.exit(1)

+    sys.exit(EX_OSFILE)

 import logging

 import time

@@ -59,10 +59,15 @@ def cmd_du(args):

         uri = S3Uri(args[0])

         if uri.type == "s3" and uri.has_bucket():

             subcmd_bucket_usage(s3, uri)

-            return

+            return EX_OK

     subcmd_bucket_usage_all(s3)

+    return EX_OK

 def subcmd_bucket_usage_all(s3):

+    """

+    Returns: sum of bucket sizes as integer

+    Raises: S3Error

+    """

     response = s3.list_all_buckets()

     buckets_size = 0

@@ -74,8 +79,14 @@ def subcmd_bucket_usage_all(s3):

     total_size_str = str(total_size) + size_coeff

     output(u"".rjust(8, "-"))

     output(u"%s Total" % (total_size_str.ljust(8)))

+    return size

 def subcmd_bucket_usage(s3, uri):

+    """

+    Returns: bucket size as integer

+    Raises: S3Error

+    """

+

     bucket = uri.bucket()

     object = uri.object()

@@ -91,9 +102,7 @@ def subcmd_bucket_usage(s3, uri):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % bucket)

-                return

-            else:

-                raise

+            raise

         # objects in the current scope:

         for obj in response["list"]:

@@ -114,8 +123,9 @@ def cmd_ls(args):

         uri = S3Uri(args[0])

         if uri.type == "s3" and uri.has_bucket():

             subcmd_bucket_list(s3, uri)

-            return

+            return EX_OK

     subcmd_buckets_list_all(s3)

+    return EX_OK

 def cmd_buckets_list_all_all(args):

     s3 = S3(Config())

@@ -125,7 +135,7 @@ def cmd_buckets_list_all_all(args):

     for bucket in response["list"]:

         subcmd_bucket_list(s3, S3Uri("s3://" + bucket["Name"]))

         output(u"")

-

+    return EX_OK

 def subcmd_buckets_list_all(s3):

     response = s3.list_all_buckets()

@@ -147,9 +157,7 @@ def subcmd_bucket_list(s3, uri):

     except S3Error, e:

         if S3.codes.has_key(e.info["Code"]):

             error(S3.codes[e.info["Code"]] % bucket)

-            return

-        else:

-            raise

+        raise

     if cfg.list_md5:

         format_string = u"%(timestamp)16s %(size)9s%(coeff)1s  %(md5)32s  %(uri)s"

@@ -196,9 +204,8 @@ def cmd_bucket_create(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def cmd_website_info(args):

     s3 = S3(Config())

@@ -218,9 +225,8 @@ def cmd_website_info(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def cmd_website_create(args):

     s3 = S3(Config())

@@ -234,9 +240,8 @@ def cmd_website_create(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def cmd_website_delete(args):

     s3 = S3(Config())

@@ -250,9 +255,8 @@ def cmd_website_delete(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def cmd_expiration_set(args):

     s3 = S3(Config())

@@ -269,9 +273,8 @@ def cmd_expiration_set(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def cmd_bucket_delete(args):

     def _bucket_delete_one(uri):

@@ -279,25 +282,32 @@ def cmd_bucket_delete(args):

             response = s3.bucket_delete(uri.bucket())

             output(u"Bucket '%s' removed" % uri.uri())

         except S3Error, e:

+            if e.info['Code'] == 'NoSuchBucket':

+                if cfg.force:

+                    return EX_OK

+                else:

+                    return EX_USAGE

             if e.info['Code'] == 'BucketNotEmpty' and (cfg.force or cfg.recursive):

                 warning(u"Bucket is not empty. Removing all the objects from it first. This may take some time...")

-                success = subcmd_batch_del(uri_str = uri.uri())

-                if success:

+                rc = subcmd_batch_del(uri_str = uri.uri())

+                if rc == EX_OK:

                     return _bucket_delete_one(uri)

                 else:

                     output(u"Bucket was not removed")

             elif S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+        return EX_OK

     s3 = S3(Config())

     for arg in args:

         uri = S3Uri(arg)

         if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():

             raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % arg)

-        _bucket_delete_one(uri)

+        rc = _bucket_delete_one(uri)

+        if rc != EX_OK:

+            return rc

+    return EX_OK

 def cmd_object_put(args):

     cfg = Config()

@@ -345,7 +355,7 @@ def cmd_object_put(args):

             output(u"upload: %s -> %s" % (nicekey, local_list[key]['remote_uri']))

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     seq = 0

     for key in local_list:

@@ -358,7 +368,7 @@ def cmd_object_put(args):

         full_name = full_name_orig

         seq_label = "[%d of %d]" % (seq, local_count)

         if Config().encrypt:

-            exitcode, full_name, extra_headers["x-amz-meta-s3tools-gpgenc"] = gpg_encrypt(full_name_orig)

+            gpg_exitcode, full_name, extra_headers["x-amz-meta-s3tools-gpgenc"] = gpg_encrypt(full_name_orig)

         if cfg.preserve_attrs or local_list[key]['size'] > (cfg.multipart_chunk_size_mb * 1024 * 1024):

             attr_header = _build_attr_header(local_list, key)

             debug(u"attr_header: %s" % attr_header)

@@ -383,6 +393,7 @@ def cmd_object_put(args):

         if Config().encrypt and full_name != full_name_orig:

             debug(u"Removing temporary encrypted file: %s" % unicodise(full_name))

             os.remove(full_name)

+    return EX_OK

 def cmd_object_get(args):

     cfg = Config()

@@ -462,7 +473,7 @@ def cmd_object_get(args):

             output(u"download: %s -> %s" % (remote_list[key]['object_uri_str'], remote_list[key]['local_filename']))

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     seq = 0

     for key in remote_list:

@@ -537,6 +548,7 @@ def cmd_object_get(args):

         if Config().delete_after_fetch:

             s3.object_delete(uri)

             output(u"File %s removed after fetch" % (uri))

+    return EX_OK

 def cmd_object_del(args):

     recursive = Config().recursive

@@ -551,11 +563,19 @@ def cmd_object_del(args):

                 raise ParameterError("File name required, not only the bucket name. Alternatively use --recursive")

         if not recursive:

-            subcmd_object_del_uri(uri_str)

+            rc = subcmd_object_del_uri(uri_str)

         else:

-            subcmd_batch_del(uri_str = uri_str)

+            rc = subcmd_batch_del(uri_str = uri_str)

+        if not rc:

+            return rc

+    return EX_OK

 def subcmd_batch_del(uri_str = None, bucket = None, remote_list = None):

+    """

+    Returns: EX_OK

+    Raises: ValueError

+    """

+

     def _batch_del(remote_list):

         s3 = S3(cfg)

         to_delete = remote_list[:1000]

@@ -580,21 +600,25 @@ def subcmd_batch_del(uri_str = None, bucket = None, remote_list = None):

         remote_list, exclude_list = fetch_remote_list(uri_str, require_attribs = False)

     if len(remote_list) == 0:

-        debug(u"Remote list is empty.")

-        return False

+        warning(u"Remote list is empty.")

+        return EX_OK

     if cfg.max_delete > 0 and len(remote_list) > cfg.max_delete:

         warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

-        return False

+        return EX_OK

     _batch_del(remote_list)

     if cfg.dry_run:

         warning(u"Exiting now because of --dry-run")

-        return False

-    return True

+        return EX_OK

+    return EX_OK

 def subcmd_object_del_uri(uri_str, recursive = None):

+    """

+    Returns: True if XXX, False if XXX

+    Raises: ValueError

+    """

     s3 = S3(cfg)

     if recursive is None:

@@ -607,7 +631,7 @@ def subcmd_object_del_uri(uri_str, recursive = None):

     info(u"Summary: %d remote files to delete" % remote_count)

     if cfg.max_delete > 0 and remote_count > cfg.max_delete:

         warning(u"delete: maximum requested number of deletes would be exceeded, none performed.")

-        return

+        return False

     if cfg.dry_run:

         for key in exclude_list:

@@ -616,12 +640,13 @@ def subcmd_object_del_uri(uri_str, recursive = None):

             output(u"delete: %s" % remote_list[key]['object_uri_str'])

         warning(u"Exiting now because of --dry-run")

-        return

+        return True

     for key in remote_list:

         item = remote_list[key]

         response = s3.object_delete(S3Uri(item['object_uri_str']))

         output(u"File %s deleted" % item['object_uri_str'])

+    return True

 def cmd_object_restore(args):

     s3 = S3(cfg)

@@ -642,7 +667,7 @@ def cmd_object_restore(args):

             output(u"restore: %s" % remote_list[key]['object_uri_str'])

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     for key in remote_list:

         item = remote_list[key]

@@ -653,6 +678,7 @@ def cmd_object_restore(args):

             output(u"File %s restoration started" % item['object_uri_str'])

         else:

             debug(u"Skipping directory since only files may be restored")

+    return EX_OK

 def subcmd_cp_mv(args, process_fce, action_str, message):

@@ -694,7 +720,7 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

             output(u"%s: %s -> %s" % (action_str, remote_list[key]['object_uri_str'], remote_list[key]['dest_name']))

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     seq = 0

     for key in remote_list:

@@ -716,18 +742,19 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

                 warning(u"Key not found %s" % item['object_uri_str'])

             else:

                 raise

+    return EX_OK

 def cmd_cp(args):

     s3 = S3(Config())

-    subcmd_cp_mv(args, s3.object_copy, "copy", u"File %(src)s copied to %(dst)s")

+    return subcmd_cp_mv(args, s3.object_copy, "copy", u"File %(src)s copied to %(dst)s")

 def cmd_modify(args):

     s3 = S3(Config())

-    subcmd_cp_mv(args, s3.object_copy, "modify", u"File %(src)s modified")

+    return subcmd_cp_mv(args, s3.object_copy, "modify", u"File %(src)s modified")

 def cmd_mv(args):

     s3 = S3(Config())

-    subcmd_cp_mv(args, s3.object_move, "move", u"File %(src)s moved to %(dst)s")

+    return subcmd_cp_mv(args, s3.object_move, "move", u"File %(src)s moved to %(dst)s")

 def cmd_info(args):

     s3 = S3(Config())

@@ -791,9 +818,8 @@ def cmd_info(args):

         except S3Error, e:

             if S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

-                return

-            else:

-                raise

+            raise

+    return EX_OK

 def filedicts_to_keys(*args):

     keys = set()

@@ -842,7 +868,7 @@ def cmd_sync_remote2remote(args):

         for key in src_list:

             output(u"Sync: %s -> %s" % (src_list[key]['object_uri_str'], src_list[key]['target_uri']))

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     # if there are copy pairs, we can't do delete_before, on the chance

     # we need one of the to-be-deleted files as a copy source.

@@ -900,6 +926,7 @@ def cmd_sync_remote2remote(args):

     # Delete items in destination that are not in source

     if cfg.delete_removed and cfg.delete_after:

         subcmd_batch_del(remote_list = dst_list)

+    return EX_OK

 def cmd_sync_remote2local(args):

     def _do_deletes(local_list):

@@ -964,7 +991,7 @@ def cmd_sync_remote2local(args):

             output(u"download: %s -> %s" % (update_list[key]['object_uri_str'], update_list[key]['local_filename']))

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     # if there are copy pairs, we can't do delete_before, on the chance

     # we need one of the to-be-deleted files as a copy source.

@@ -1131,6 +1158,7 @@ def cmd_sync_remote2local(args):

     if cfg.delete_removed and cfg.delete_after:

         _do_deletes(local_list)

+    return EX_OK

 def local_copy(copy_pairs, destination_base):

     # Do NOT hardlink local files by default, that'd be silly

@@ -1213,20 +1241,24 @@ def _build_attr_header(local_list, src):

 def cmd_sync_local2remote(args):

     def _single_process(local_list):

+        any_child_failed = False

         for dest in destinations:

             ## Normalize URI to convert s3://bkt to s3://bkt/ (trailing slash)

             destination_base_uri = S3Uri(dest)

             if destination_base_uri.type != 's3':

                 raise ParameterError("Destination must be S3Uri. Got: %s" % destination_base_uri)

             destination_base = str(destination_base_uri)

-            _child(destination_base, local_list)

-            return destination_base_uri

+            rc = _child(destination_base, local_list)

+            if rc:

+                any_child_failed = True

+        return any_child_failed

     def _parent():

         # Now that we've done all the disk I/O to look at the local file system and

         # calculate the md5 for each file, fork for each destination to upload to them separately

         # and in parallel

         child_pids = []

+        any_child_failed = False

         for dest in destinations:

             ## Normalize URI to convert s3://bkt to s3://bkt/ (trailing slash)

@@ -1244,8 +1276,10 @@ def cmd_sync_local2remote(args):

         while len(child_pids):

             (pid, status) = os.wait()

             child_pids.remove(pid)

+            if status:

+                any_child_failed = True

-        return

+        return any_child_failed

     def _child(destination_base, local_list):

         def _set_remote_uri(local_list, destination_base, single_file_local):

@@ -1333,7 +1367,7 @@ def cmd_sync_local2remote(args):

                     output(u"delete: %s" % remote_list[key]['object_uri_str'])

             warning(u"Exiting now because of --dry-run")

-            return

+            return EX_OK

         # if there are copy pairs, we can't do delete_before, on the chance

         # we need one of the to-be-deleted files as a copy source.

@@ -1374,7 +1408,7 @@ def cmd_sync_local2remote(args):

         else:

             info(outstr)

-        return

+        return EX_OK

     def _invalidate_on_cf(destination_base_uri):

         cf = CloudFront(cfg)

@@ -1400,7 +1434,7 @@ def cmd_sync_local2remote(args):

         error(u"S3cmd 'sync' doesn't yet support GPG encryption, sorry.")

         error(u"Either use unconditional 's3cmd put --recursive'")

         error(u"or disable encryption with --no-encrypt parameter.")

-        sys.exit(1)

+        sys.exit(EX_USAGE)

     local_list, single_file_local, src_exclude_list = fetch_local_list(args[:-1], is_src = True, recursive = True)

@@ -1409,16 +1443,23 @@ def cmd_sync_local2remote(args):

         destinations = destinations + cfg.additional_destinations

     if 'fork' not in os.__all__ or len(destinations) < 2:

-        destination_base_uri = _single_process(local_list)

+        any_child_failed = _single_process(local_list)

+        destination_base_uri = S3Uri(destinations[-1])

         if cfg.invalidate_on_cf:

             if len(uploaded_objects_list) == 0:

                 info("Nothing to invalidate in CloudFront")

             else:

                 _invalidate_on_cf(destination_base_uri)

     else:

-        _parent()

+        any_child_failed = _parent()

         if cfg.invalidate_on_cf:

             error(u"You cannot use both --cf-invalidate and --add-destination.")

+            return(EX_USAGE)

+

+    if any_child_failed:

+        return EX_SOFTWARE

+    else:

+        return EX_OK

 def cmd_sync(args):

     if (len(args) < 2):

@@ -1465,7 +1506,7 @@ def cmd_setacl(args):

             output(u"setacl: %s" % remote_list[key]['object_uri_str'])

         warning(u"Exiting now because of --dry-run")

-        return

+        return EX_OK

     seq = 0

     for key in remote_list:

@@ -1473,6 +1514,7 @@ def cmd_setacl(args):

         seq_label = "[%d of %d]" % (seq, remote_count)

         uri = S3Uri(remote_list[key]['object_uri_str'])

         update_acl(s3, uri, seq_label)

+    return EX_OK

 def cmd_setpolicy(args):

     s3 = S3(cfg)

@@ -1480,7 +1522,7 @@ def cmd_setpolicy(args):

     policy_file = args[0]

     policy = open(policy_file, 'r').read()

-    if cfg.dry_run: return

+    if cfg.dry_run: return EX_OK

     response = s3.set_policy(uri, policy)

@@ -1488,18 +1530,19 @@ def cmd_setpolicy(args):

     debug(u"response - %s" % response['status'])

     if response['status'] == 204:

         output(u"%s: Policy updated" % uri)

+    return EX_OK

 def cmd_delpolicy(args):

     s3 = S3(cfg)

     uri = S3Uri(args[0])

-    if cfg.dry_run: return

+    if cfg.dry_run: return EX_OK

     response = s3.delete_policy(uri)

     #if retsponse['status'] == 200:

     debug(u"response - %s" % response['status'])

     output(u"%s: Policy deleted" % uri)

-

+    return EX_OK

 def cmd_multipart(args):

     s3 = S3(cfg)

@@ -1519,6 +1562,7 @@ def cmd_multipart(args):

             output("%s\t%s\t%s" % (mpupload['Initiated'], "s3://" + uri.bucket() + "/" + mpupload['Key'], mpupload['UploadId']))

         except KeyError:

             pass

+    return EX_OK

 def cmd_abort_multipart(args):

     '''{"cmd":"abortmp",   "label":"abort a multipart upload", "param":"s3://BUCKET Id", "func":cmd_abort_multipart, "argc":2},'''

@@ -1528,6 +1572,7 @@ def cmd_abort_multipart(args):

     response = s3.abort_multipart(uri, id)

     debug(u"response - %s" % response['status'])

     output(u"%s" % uri)

+    return EX_OK

 def cmd_list_multipart(args):

     '''{"cmd":"abortmp",   "label":"list a multipart upload", "param":"s3://BUCKET Id", "func":cmd_list_multipart, "argc":2},'''

@@ -1544,6 +1589,7 @@ def cmd_list_multipart(args):

             output("%s\t%s\t%s\t%s" % (mpupload['LastModified'], mpupload['PartNumber'], mpupload['ETag'], mpupload['Size']))

         except:

             pass

+    return EX_OK

 def cmd_accesslog(args):

     s3 = S3(cfg)

@@ -1565,12 +1611,14 @@ def cmd_accesslog(args):

     if accesslog.isLoggingEnabled():

         output(u"     Target prefix: %s" % accesslog.targetPrefix().uri())

         #output(u"   Public Access:   %s" % accesslog.isAclPublic())

+    return EX_OK

 def cmd_sign(args):

     string_to_sign = args.pop()

     debug("string-to-sign: %r" % string_to_sign)

     signature = Utils.sign_string(string_to_sign)

     output("Signature: %s" % signature)

+    return EX_OK

 def cmd_signurl(args):

     expiry = args.pop()

@@ -1580,6 +1628,7 @@ def cmd_signurl(args):

     debug("url to sign: %r" % url_to_sign)

     signed_url = Utils.sign_url(url_to_sign, expiry)

     output(signed_url)

+    return EX_OK

 def cmd_fixbucket(args):

     def _unescape(text):

@@ -1647,6 +1696,7 @@ def cmd_fixbucket(args):

         warning("Fixed %d files' names. Their ACL were reset to Private." % count)

         warning("Use 's3cmd setacl --acl-public s3://...' to make")

         warning("them publicly readable if required.")

+    return EX_OK

 def resolve_list(lst, args):

     retval = []

@@ -1839,14 +1889,14 @@ def run_configure(config_file, args):

     except IOError, e:

         error(u"Writing config file failed: %s: %s" % (config_file, e.strerror))

-        sys.exit(1)

+        sys.exit(EX_IOERR)

 def process_patterns_from_file(fname, patterns_list):

     try:

         fn = open(fname, "rt")

     except IOError, e:

         error(e)

-        sys.exit(1)

+        sys.exit(EX_IOERR)

     for pattern in fn:

         pattern = pattern.strip()

         if re.match("^#", pattern) or re.match("^\s*$", pattern):

@@ -2162,7 +2212,7 @@ def main():

     if options.show_version:

         output(u"s3cmd version %s" % PkgInfo.version)

-        sys.exit(0)

+        sys.exit(EX_OK)

     if options.quiet:

         try:

@@ -2175,7 +2225,7 @@ def main():

     ## Now finally parse the config file

     if not options.config:

         error(u"Can't find a config file. Please use --config option.")

-        sys.exit(1)

+        sys.exit(EX_CONFIG)

     try:

         cfg = Config(options.config, options.access_key, options.secret_key)

@@ -2186,7 +2236,7 @@ def main():

             error(u"%s: %s"  % (options.config, e.strerror))

             error(u"Configuration file not available.")

             error(u"Consider using --configure parameter to create one.")

-            sys.exit(1)

+            sys.exit(EX_CONFIG)

     # allow commandline verbosity config to override config file

     if options.verbosity is not None:

@@ -2322,20 +2372,20 @@ def main():

     if cfg.encrypt and cfg.gpg_passphrase == "":

         error(u"Encryption requested but no passphrase set in config file.")

         error(u"Please re-run 's3cmd --configure' and supply it.")

-        sys.exit(1)

+        sys.exit(EX_CONFIG)

     if options.dump_config:

         cfg.dump_config(sys.stdout)

-        sys.exit(0)

+        sys.exit(EX_OK)

     if options.run_configure:

         # 'args' may contain the test-bucket URI

         run_configure(options.config, args)

-        sys.exit(0)

+        sys.exit(EX_OK)

     if len(args) < 1:

         optparser.print_help()

-        sys.exit(1)

+        sys.exit(EX_USAGE)

     ## Unicodise all remaining arguments:

     args = [unicodise(arg) for arg in args]

@@ -2349,17 +2399,20 @@ def main():

         cmd_func = commands[command]["func"]

     except KeyError, e:

         error(u"Invalid command: %s" % e)

-        sys.exit(1)

+        sys.exit(EX_USAGE)

     if len(args) < commands[command]["argc"]:

         error(u"Not enough parameters for command '%s'" % command)

-        sys.exit(1)

+        sys.exit(EX_USAGE)

     try:

-        cmd_func(args)

+        rc = cmd_func(args)

+        if rc is None: # if we missed any cmd_*() returns

+            rc = EX_GENERAL

+        return rc

     except S3Error, e:

         error(u"S3 error: %s" % e)

-        sys.exit(1)

+        sys.exit(EX_SOFTWARE)

 def report_exception(e, msg=''):

         sys.stderr.write(u"""

@@ -2419,6 +2472,7 @@ if __name__ == '__main__':

         ## Our modules

         ## Keep them in try/except block to

         ## detect any syntax errors in there

+        from S3.ExitCodes import *

         from S3.Exceptions import *

         from S3 import PkgInfo

         from S3.S3 import S3

@@ -2434,27 +2488,39 @@ if __name__ == '__main__':

         from S3.FileLists import *

         from S3.MultiPart import MultiPartUpload

-        main()

-        sys.exit(0)

+        rc = main()

+        sys.exit(rc)

     except ImportError, e:

         report_exception(e)

-        sys.exit(1)

+        sys.exit(EX_GENERAL)

-    except ParameterError, e:

+    except (ParameterError, InvalidFileError), e:

         error(u"Parameter problem: %s" % e)

-        sys.exit(1)

+        sys.exit(EX_USAGE)

+

+    except (S3DownloadError, S3UploadError, S3RequestError), e:

+        error(u"S3 Temporary Error: %s.  Please try again later." % e)

+        sys.exit(EX_TEMPFAIL)

+

+    except (S3Error, S3Exception, S3ResponseError, CloudFrontError), e:

+        report_exception(e)

+        sys.exit(EX_SOFTWARE)

     except SystemExit, e:

         sys.exit(e.code)

     except KeyboardInterrupt:

         sys.stderr.write("See ya!\n")

-        sys.exit(1)

+        sys.exit(EX_BREAK)

+

+    except IOError, e:

+        error(e)

+        sys.exit(EX_IOERR)

-    except (OSError, IOError), e:

+    except OSError, e:

         error(e)

-        sys.exit(1)

+        sys.exit(EX_OSERR)

     except MemoryError:

         msg = """

@@ -2465,7 +2531,7 @@ The solutions to this are:

 2) use a 64-bit python on a 64-bit OS with >8GB RAM

         """

         sys.stderr.write(msg)

-        sys.exit(1)

+        sys.exit(EX_OSERR)

     except UnicodeEncodeError, e:

         lang = os.getenv("LANG")

@@ -2476,10 +2542,10 @@ Please set LANG=en_US.UTF-8 or similar in your environment before

 invoking s3cmd.

         """ % lang

         report_exception(e, msg)

-        sys.exit(1)

+        sys.exit(EX_GENERAL)

     except Exception, e:

         report_exception(e)

-        sys.exit(1)

+        sys.exit(EX_GENERAL)

 # vim:et:ts=4:sts=4:ai