[ARVADOS] created: 2.1.0-2310-gb3919687f

[Git user]

        at  b3919687f18582ccff1a6316846dcb04d9b5f989 (commit)


commit b3919687f18582ccff1a6316846dcb04d9b5f989
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 15:26:24 2022 -0400

    18995: fuse: do not overwrite function argument in test.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/fuse/tests/performance/test_collection_performance.py b/services/fuse/tests/performance/test_collection_performance.py
index 475e0e75e..98bc98abd 100644
--- a/services/fuse/tests/performance/test_collection_performance.py
+++ b/services/fuse/tests/performance/test_collection_performance.py
@@ -472,10 +472,9 @@ class FuseListLargeProjectContents(MountTestBase):
         project_contents = llfuse.listdir(self.mounttmp)
         self.assertEqual(201, len(project_contents))
         self.assertIn('Collection_1', project_contents)
-        return project_contents
 
     @profiled
-    def listContentsInProjectWithManyCollections(self, project_contents):
+    def listContentsInProjectWithManyCollections(self):
         project_contents = llfuse.listdir(self.mounttmp)
         self.assertEqual(201, len(project_contents))
         self.assertIn('Collection_1', project_contents)
@@ -488,5 +487,5 @@ class FuseListLargeProjectContents(MountTestBase):
     def test_listLargeProjectContents(self):
         self.make_mount(fuse.ProjectDirectory,
                         project_object=run_test_server.fixture('groups')['project_with_201_collections'])
-        project_contents = self.getProjectWithManyCollections()
-        self.listContentsInProjectWithManyCollections(project_contents)
+        self.getProjectWithManyCollections()
+        self.listContentsInProjectWithManyCollections()

commit 497f1df923baea17271decacfd80c251fde467cf
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 15:22:24 2022 -0400

    18995: match up formatting strings and the number of arguments.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/gen_api_method_docs.py b/doc/gen_api_method_docs.py
index d2a743bb7..9a29d4616 100755
--- 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:
-            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(
diff --git a/sdk/python/arvados/commands/get.py b/sdk/python/arvados/commands/get.py
index c061c70f0..c4262c59c 100755
--- 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:
-                        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:

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


hooks/post-receive
--