lib/ohloh_scm/adapters/cvs/misc.rb in ohloh_scm-2.4.8 vs lib/ohloh_scm/adapters/cvs/misc.rb in ohloh_scm-2.4.9

- old
+ new

@@ -190,15 +190,15 @@ cmd = "#{ensure_key_file} '#{ self.host }'" stdout, stderr = run_with_err(cmd) end end - def has_lock? + def has_lock! begin - run "timeout 30 cvsnt -q -d #{self.url} rlog '#{self.module_name}'" + run "timeout 2m cvsnt -q -d #{self.url} rlog '#{self.module_name}'" false rescue => e - e.message.match(/waiting for.*lock in/) ? true : false + raise RuntimeError.new('CVS lock has been found') if e.message.match(/waiting for.*lock in/) end end def tags tag_strings = run("cvs -Q -d #{ url } rlog -h #{ module_name } | awk -F\"[.:]\" '/^\\t/&&$(NF-1)!=0'").split(/\n/)