From 777f590406055c7aac2d8b9f0ed4a3eb503c1900 Mon Sep 17 00:00:00 2001
From: Chris Brinker <chris.brinker@gmail.com>
Date: Wed, 4 Dec 2013 15:07:47 -0800
Subject: [PATCH 1/2] Implement an ignore-size option to force copy operations
 to execute even if the file is the same size. This is useful when using
 createrepo as the repomd.xml is sometimes the same size on disk, but
 comprised of different hashes.

---
 bin/boto-rsync | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/bin/boto-rsync b/bin/boto-rsync
index 76278b2..20b293f 100644
--- a/bin/boto-rsync
+++ b/bin/boto-rsync
@@ -271,6 +271,11 @@ def main():
              'size is 0. Warning: S3/GS often uses empty keys with special ' + \
              'trailing characters to specify directories.'
         )
+    parser.add_argument(
+        '--ignore-size', action='store_true',
+        help='Ignore file size comparisons. Copy the file even if the file ' + \
+             'is the same size'
+        )
     parser.add_argument(
         '--delete', action='store_true',
         help='Delete extraneous files from destination dirs after the ' + \
@@ -325,6 +330,7 @@ def main():
         no_recurse = args.no_recurse or glob
         skip_dirkeys = args.skip_dirkeys
         ignore_empty = args.ignore_empty
+        ignore_size = args.ignore_size
         delete = args.delete
         no_op = args.no_op
         quiet = args.quiet
@@ -503,7 +509,7 @@ def main():
                              key_name.endswith('_$folder$'):
                             if not quiet:
                                 sys.stdout.write(
-                                    'Skipping %s (size matches)\n' %
+                                    'Skipping %s (is directory)\n' %
                                     key_name.replace('_$folder$', '/')
                                     )
                             create_dirkey = False
@@ -559,7 +565,7 @@ def main():
                                     fullpath[len(path):].lstrip(os.sep)
                                     )
                             continue
-                        elif keys[key_name] == file_size:
+                        elif not ignore_size and keys[key_name] == file_size:
                             if not quiet:
                                 sys.stdout.write(
                                     'Skipping %s (size matches)\n' %
@@ -663,7 +669,7 @@ def main():
                         else:
                             sys.stdout.write('Skipping %s (not overwriting)\n' %
                                              filename)
-                elif key.size == file_size:
+                elif not ignore_size and key.size == file_size:
                     copy_file = False
                     if not quiet:
                         if filename != key_name.split('/')[-1]:
@@ -766,7 +772,7 @@ def main():
                                 fullpath.split(os.sep)[-1]
                                 )
                     copy_file = False
-                elif key.size == os.path.getsize(fullpath):
+                elif not ignore_size and key.size == os.path.getsize(fullpath):
                     if not quiet:
                         if rename:
                             sys.stdout.write(
@@ -856,15 +862,21 @@ def main():
                                 fullpath[len(os.path.join(path, '')):]
                                 )
                         continue
-                    elif key.size == os.path.getsize(fullpath) or \
-                         key.name.endswith('/') or \
-                         key.name.endswith('_$folder$'):
+                    elif not ignore_size and key.size == os.path.getsize(fullpath):
                         if not quiet:
                             sys.stdout.write(
                                 'Skipping %s (size matches)\n' %
                                 fullpath[len(os.path.join(path, '')):]
                                 )
                         continue
+                    elif key.name.endswith('/') or \
+                         key.name.endswith('_$folder$'):
+                        if not quiet:
+                            sys.stdout.write(
+                                'Skipping %s (is directory)\n' %
+                                fullpath[len(os.path.join(path, '')):]
+                                )
+                        continue
                 
                 if cloud_service == 'gs':
                     sys.stdout.write('%s\n' %
@@ -976,7 +988,7 @@ def main():
                                 'Skipping %s (not overwriting)\n' % fullpath
                                 )
                     copy_file = False
-                elif key.size == dest_key.size:
+                elif not ignore_size and key.size == dest_key.size:
                     if not quiet:
                         if rename:
                             sys.stdout.write(
@@ -1084,7 +1096,7 @@ def main():
                                 fullpath.replace('_$folder$', '/')
                                 )
                         continue
-                    elif key.size == dest_key.size:
+                    elif not ignore_size and key.size == dest_key.size:
                         if not quiet:
                             sys.stdout.write(
                                 'Skipping %s (size matches)\n' %

From dc816a148333945dc85cfd30cb59d6027d178187 Mon Sep 17 00:00:00 2001
From: Chris Brinker <chris.brinker@gmail.com>
Date: Thu, 16 Jan 2014 12:54:19 -0800
Subject: [PATCH 2/2] Using setuptools by default

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index eaaef88..c6f60b1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 import os, sys
 try:
-    from distutils.core import setup
-except ImportError:
     from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 install_requires = ['boto>=2.2.1']