[ARVADOS] updated: 1.3.0-140-g61248e845

[Git user]

Summary of changes:
 sdk/ruby/lib/arvados/keep.rb        | 7 +++++--
 sdk/ruby/test/test_keep_manifest.rb | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

       via  61248e8459dd3c99a62056739609f75231f9e385 (commit)
      from  7b86c93c104581fbf7a1fc9bfeb1ae300b9ee29e (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 61248e8459dd3c99a62056739609f75231f9e385
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Jan 7 12:39:12 2019 -0300

    14482: Fix Manifest::files_count()
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/sdk/ruby/lib/arvados/keep.rb b/sdk/ruby/lib/arvados/keep.rb
index 2d444d074..d27161033 100644
--- a/sdk/ruby/lib/arvados/keep.rb
+++ b/sdk/ruby/lib/arvados/keep.rb
@@ -205,10 +205,13 @@ module Keep
       # files.  This can help you avoid parsing the entire manifest if you
       # just want to check if a small number of files are specified.
       if stop_after.nil? or not @files.nil?
-        return files.size
+        # Avoid counting empty dir placeholders
+        return files.reject{|_, name, size| name == '.' and size == 0}.size
       end
       seen_files = {}
-      each_file_spec do |streamname, _, _, filename|
+      each_file_spec do |streamname, _, filesize, filename|
+        # Avoid counting empty dir placeholders
+        next if filename == "." and filesize == 0
         seen_files[[streamname, filename]] = true
         return stop_after if (seen_files.size >= stop_after)
       end
diff --git a/sdk/ruby/test/test_keep_manifest.rb b/sdk/ruby/test/test_keep_manifest.rb
index bd1312701..5fd1c31e3 100644
--- a/sdk/ruby/test/test_keep_manifest.rb
+++ b/sdk/ruby/test/test_keep_manifest.rb
@@ -62,6 +62,11 @@ class ManifestTest < Minitest::Test
     assert_equal(0, Keep::Manifest.new("").files_count)
   end
 
+  def test_empty_dir_files_count
+    assert_equal(0,
+      Keep::Manifest.new("./empty_dir d41d8cd98f00b204e9800998ecf8427e+0 0:0:\\056\n").files_count)
+  end
+
   def test_empty_files_size
     assert_equal(0, Keep::Manifest.new("").files_size)
   end

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


hooks/post-receive
--