18995: match up formatting strings and the number of arguments.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/doc/gen_api_method_docs.py b/doc/gen_api_method_docs.py
index d2a743bb78ba266ba39cadb15f559ffd67590558..9a29d461670ca937925631929d2f3d0531a8fe59 100755 (executable)
--- a/doc/gen_api_method_docs.py
+++ b/doc/gen_api_method_docs.py
@@ -59,7 +59,7 @@ for resource in sorted(api[u'resources']):
         try:
             os.rename(out_fname, backup_name)
         except OSError as e:
         try:
             os.rename(out_fname, backup_name)
         except OSError as e:

-            print "WARNING: could not back up {1} as {2}: {3}".format(
+            print "WARNING: could not back up {0} as {1}: {2}".format(

                 out_fname, backup_name, e)
     outf = open(out_fname, 'w')
     outf.write(
                 out_fname, backup_name, e)
     outf = open(out_fname, 'w')
     outf.write(

diff --git a/sdk/python/arvados/commands/get.py b/sdk/python/arvados/commands/get.py
index c061c70f0eebbac2ed2025fdecd27865c27139b8..c4262c59c9daa6bc8687bd7f6e360e26088e4914 100755 (executable)
--- a/sdk/python/arvados/commands/get.py
+++ b/sdk/python/arvados/commands/get.py
@@ -290,7 +290,7 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
                                        if todo_bytes==0
                                        else 100.0*out_bytes/todo_bytes)))
                     elif args.batch_progress:
                                        if todo_bytes==0
                                        else 100.0*out_bytes/todo_bytes)))
                     elif args.batch_progress:

-                        stderr.write('%s %d read %d total\n' %
+                        stderr.write('%s %d read %d total %d\n' %

                                      (sys.argv[0], os.getpid(),
                                       out_bytes, todo_bytes))
             if digestor:
                                      (sys.argv[0], os.getpid(),
                                       out_bytes, todo_bytes))
             if digestor: