[ARVADOS] updated: fb01e30424d20a3430f45826e57410b8e2e5440d

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/{copy.py => arv_copy.py} | 2 +-
 sdk/python/bin/arv-copy                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename sdk/python/arvados/commands/{copy.py => arv_copy.py} (99%)

       via  fb01e30424d20a3430f45826e57410b8e2e5440d (commit)
      from  e8451457c28477a5c3716e878d09d0be147186d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fb01e30424d20a3430f45826e57410b8e2e5440d
Author: Tim Pierce <twp at curoverse.com>
Date:   Fri Oct 24 13:57:23 2014 -0400

    3699: fix namespace clash: rename module to arv_copy
    
    Prevents confusion with the Python 'copy' module.
    
    No issue # (bug fix)

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/arv_copy.py
similarity index 99%
rename from sdk/python/arvados/commands/copy.py
rename to sdk/python/arvados/commands/arv_copy.py
index 7841f90..7da23ac 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -626,7 +626,7 @@ def abort(msg, code=1):
 # Code for reporting on the progress of a collection upload.
 # Stolen from arvados.commands.put.ArvPutCollectionWriter
 # TODO(twp): figure out how to refactor into a shared library
-# (may involve refactoring some arvados.commands.copy.copy_collection
+# (may involve refactoring some arvados.commands.arv_copy.copy_collection
 # code)
 
 def machine_progress(obj_uuid, bytes_written, bytes_expected):
diff --git a/sdk/python/bin/arv-copy b/sdk/python/bin/arv-copy
index 2de0f0c..4ee08de 100755
--- a/sdk/python/bin/arv-copy
+++ b/sdk/python/bin/arv-copy
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from arvados.commands.copy import main
+from arvados.commands.arv_copy import main
 main()

-----------------------------------------------------------------------


hooks/post-receive
--