[ARVADOS] updated: 1.3.0-1753-g0099f77a8

[Git user]

Summary of changes:
 sdk/ruby/lib/arvados/collection.rb | 78 ++++++++++++++++++--------------------
 sdk/ruby/test/test_collection.rb   | 26 ++++++++++++-
 2 files changed, 61 insertions(+), 43 deletions(-)

       via  0099f77a806d38ff1f7bd1c2b45da2bdec4c89ec (commit)
       via  bffa7bbad96a9ce0679ce0121ee46cee552befdb (commit)
       via  a50fab63068c1e8d67ce1d477c6f2c2429464b5c (commit)
      from  6e0e8f6509169fc5c79112c5ab159d16c9e949d6 (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 0099f77a806d38ff1f7bd1c2b45da2bdec4c89ec
Merge: 6e0e8f650 bffa7bbad
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 15 15:21:55 2019 -0400

    Merge branch '15699-workbench-copy-fail'
    
    refs #15699
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit bffa7bbad96a9ce0679ce0121ee46cee552befdb
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 15 15:20:23 2019 -0400

    15699: Remove unused variables.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/ruby/lib/arvados/collection.rb b/sdk/ruby/lib/arvados/collection.rb
index 796d1785a..29c7663f7 100644
--- a/sdk/ruby/lib/arvados/collection.rb
+++ b/sdk/ruby/lib/arvados/collection.rb
@@ -536,12 +536,10 @@ module Arv
         end
 
         segment_start = @loc_range_start
-        segment_end = segment_start
         segment.locators.each do |loc_s|
           r = LocatorRange.new(loc_s, @loc_range_start)
           @loc_ranges << r
           @loc_range_start = r.end
-          segment_end += (r.end - r.begin)
         end
         @file_specs << "#{segment.start_pos + segment_start}:#{segment.length}:#{escape_name(filename)}"
       end
diff --git a/sdk/ruby/test/test_collection.rb b/sdk/ruby/test/test_collection.rb
index 29ec6d418..197944373 100644
--- a/sdk/ruby/test/test_collection.rb
+++ b/sdk/ruby/test/test_collection.rb
@@ -404,7 +404,6 @@ class CollectionTest < Minitest::Test
     src_coll = Arv::Collection.new(". #{blocks[0]} #{blocks[1]} #{blocks[2]} #{blocks[0]} #{blocks[1]} #{blocks[2]} #{blocks[3]} #{blocks[4]} 27:27:f1\n")
     dst_coll = Arv::Collection.new()
     dst_coll.cp_r("f1", "./", src_coll)
-    toks = dst_coll.manifest_text.split(" ")
     assert_equal(". #{blocks[0]} #{blocks[1]} #{blocks[2]} 0:27:f1\n", dst_coll.manifest_text, "mangled by cp_r")
   end
 
@@ -415,7 +414,6 @@ class CollectionTest < Minitest::Test
     src_coll.normalize
     assert_equal(". #{blocks[2]} #{blocks[0]} #{blocks[1]} #{blocks[2]} 2:27:f1\n", src_coll.manifest_text, "mangled by normalize()")
     dst_coll.cp_r("f1", "./", src_coll)
-    toks = dst_coll.manifest_text.split(" ")
     assert_equal(". #{blocks[2]} #{blocks[0]} #{blocks[1]} #{blocks[2]} 2:27:f1\n", dst_coll.manifest_text, "mangled by cp_r")
   end
 

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


hooks/post-receive
--