On Tue, Sep 19, 2017 at 10:49 AM, Craig Russell <apache....@gmail.com> wrote: > This is the failing svn command: > > $ svn commit > /tmp/d20170919-21887-12whnw4/michal-kostrzewa/michal-kostrzewa.pdf -m > 'additional ICLA from Michael Kostrzewa' > svn: E200009: Commit failed (details follow): > svn: E200009: > '/tmp/d20170919-21887-12whnw4/michal-kostrzewa/michal-kostrzewa.pdf' is not > under version control > The name is wrong. It should be > svn commit /tmp/d20170919-21887-12whnw4/michal-kostrzewa/icla2.pdf > > This seems to be the failing code in icla2.json.rb
Good sleuthing! The following should fix it: https://github.com/apache/whimsy/commit/7bda85761f978b76c6de19ed9b6502ef7513a7fa I've tried to also handle the case where there are signatures involved, i.e., files.length > 1. - Sam Ruby > # write attachment (+ signature, if present) to the documents/iclas directory > task "svn commit documents/iclas/icla#{count}#{fileext}" do > form do > _input value: @selected, name: 'selected' > > if @signature and not @signature.empty? > _input value: @signature, name: 'signature' > end > end > > complete do |dir| > # checkout directory > svn 'checkout', > "https://svn.apache.org/repos/private/documents/iclas/#@filename";, > "#{dir}/#@filename" > > # determine numeric suffix for the new ICLA > count = Dir["#{dir}/#@filename/*"]. > map {|name| name[/.*(\d+)\./, 1] || 1}.map(&:to_i).max + 1 > > # create/add file(s) > files = {@selected => "icla#{count}#{fileext}"} > files[@signature] = "icla#{count}pdf.asc" unless @signature.to_s.empty? > message.write_svn(dir, @filename, files) > > # Show files to be added > svn 'status', "#{dir}/#@filename" > > # commit changes > svn 'commit', "#{dir}/#@filename/#{@filename}#{fileext}", > '-m', "additional ICLA from #{@pubname}" > end > end > >> On Sep 19, 2017, at 7:35 AM, Craig Russell <apache....@gmail.com> wrote: >> >> Sorry, I confused a previous icla. This one came in as a complete document. >> It's probably just the command that is wrong. >> >> Craig >> >>> On Sep 19, 2017, at 7:34 AM, Craig Russell <apache....@gmail.com >>> <mailto:apache....@gmail.com>> wrote: >>> >>> Hi, >>> >>> Second icla came in today and failed. The commands look good from the >>> client but failed at the server. >>> >>> I think the problem is the name of the new icla should be xxx/icla2.pdf >>> >>> Maybe this happened because the icla came in in two pieces that had to be >>> stapled? >>> >>> Processing Aborted >>> • svn mv michal-kostrzewa.pdf michal-kostrzewa/icla.pdf >>> $ svn checkout --depth empty >>> https://svn.apache.org/repos/private/documents/iclas >>> <https://svn.apache.org/repos/private/documents/iclas> >>> /tmp/d20170919-21887-107wf3w/iclas >>> >>> Checked out revision 78929. >>> >>> >>> $ svn update /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf >>> >>> Updating '/tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf': >>> A /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf >>> Updated to revision 78929. >>> >>> >>> $ svn add /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa >>> >>> A /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa >>> >>> >>> $ svn mv /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf >>> /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa/icla.pdf >>> >>> A /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa/icla.pdf >>> D /tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf >>> >>> >>> $ svn commit /tmp/d20170919-21887-107wf3w/iclas -m 'move previous ICLA from >>> Michael Kostrzewa' >>> >>> Adding tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa >>> Adding (bin) tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa/icla.pdf >>> Deleting tmp/d20170919-21887-107wf3w/iclas/michal-kostrzewa.pdf >>> Committing transaction... >>> Committed revision 78930. >>> >>> • svn commit documents/iclas/icla2.pdf >>> #<RuntimeError: exit code: 1> >>> /x1/srv/whimsy/www/secretary/workbench/tasks.rb:63:in `svn' >>> /x1/srv/whimsy/www/secretary/workbench/views/actions/icla2.json.rb:95:in >>> `block (2 levels) in _evaluate' >>> /x1/srv/whimsy/www/secretary/workbench/tasks.rb:44:in `block in complete' >>> /usr/local/rvm/rubies/ruby-2.4.1/lib/ruby/2.4.0/tmpdir.rb:89:in `mktmpdir' >>> /x1/srv/whimsy/www/secretary/workbench/tasks.rb:43:in `complete' >>> /x1/srv/whimsy/www/secretary/workbench/views/actions/icla2.json.rb:76:in >>> `block in _evaluate' >>> /x1/srv/whimsy/www/secretary/workbench/tasks.rb:12:in `task' >>> /x1/srv/whimsy/www/secretary/workbench/views/actions/icla2.json.rb:67:in >>> `_evaluate' >>> /x1/srv/whimsy/www/secretary/workbench/server.rb:66:in `block in <top >>> (required)>' >>> /x1/srv/whimsy/lib/whimsy/asf/rack.rb:220:in `call' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/rack/out_of_band_gc.rb:48:in >>> `call' >>> /x1/srv/whimsy/lib/whimsy/asf/rack.rb:145:in `call' >>> /x1/srv/whimsy/lib/whimsy/asf/rack.rb:76:in `call' >>> /x1/srv/whimsy/lib/whimsy/asf/rack.rb:251:in `call' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb:97:in >>> `process_request' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb:160:in >>> `accept_and_process_next_request' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb:113:in >>> `main_loop' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/request_handler.rb:416:in >>> `block (3 levels) in start_threads' >>> >>> /usr/local/rvm/gems/ruby-2.4.1/gems/passenger-5.1.8/src/ruby_supportlib/phusion_passenger/utils.rb:113:in >>> `block in create_thread_and_abort_on_exception' >>> >>> $ svn checkout >>> https://svn.apache.org/repos/private/documents/iclas/michal-kostrzewa >>> <https://svn.apache.org/repos/private/documents/iclas/michal-kostrzewa> >>> /tmp/d20170919-21887-12whnw4/michal-kostrzewa >>> >>> A /tmp/d20170919-21887-12whnw4/michal-kostrzewa/icla.pdf >>> Checked out revision 78930. >>> >>> >>> $ svn status /tmp/d20170919-21887-12whnw4/michal-kostrzewa >>> >>> A /tmp/d20170919-21887-12whnw4/michal-kostrzewa/icla2.pdf >>> >>> >>> $ svn commit >>> /tmp/d20170919-21887-12whnw4/michal-kostrzewa/michal-kostrzewa.pdf -m >>> 'additional ICLA from Michael Kostrzewa' >>> >>> svn: E200009: Commit failed (details follow): >>> svn: E200009: >>> '/tmp/d20170919-21887-12whnw4/michal-kostrzewa/michal-kostrzewa.pdf' is not >>> under version control >>> >>> • svn commit foundation/officers/iclas.txt >>> >>> • change public name in LDAP >>> >>> • email michael.kostrz...@gmail.com >>> <mailto:michael.kostrz...@gmail.com> >>> >>> • change email address in LDAP >>> >>> resume >>> Craig L Russell >>> Secretary, Apache Software Foundation >>> c...@apache.org <mailto:c...@apache.org> http://db.apache.org/jdo >>> <http://db.apache.org/jdo> >> >> Craig L Russell >> Secretary, Apache Software Foundation >> c...@apache.org <mailto:c...@apache.org> http://db.apache.org/jdo >> <http://db.apache.org/jdo> > > Craig L Russell > Secretary, Apache Software Foundation > c...@apache.org <mailto:c...@apache.org> http://db.apache.org/jdo > <http://db.apache.org/jdo>
