[cig-commits] [commit] master: Small fixes. (91f6275)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/f824f9365a21ba8760de2e40f714706247f2a84e...5dc0660d5364cadb5bdb50a243c0bbbcfedad4e9

>---------------------------------------------------------------

commit 91f62757f51d639ecdab54a37bdc1d98089c38b4
Author: Matthias Vallentin <vallentin at icir.org>
Date:   Tue Apr 29 22:52:40 2014 -0700

    Small fixes.


>---------------------------------------------------------------

91f62757f51d639ecdab54a37bdc1d98089c38b4
 gitdub | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitdub b/gitdub
index db81bbe..21f96b9 100755
--- a/gitdub
+++ b/gitdub
@@ -85,7 +85,7 @@ class GitDub
   end
 
   def process(push)
-    opts = @notifier
+    opts = @notifier.clone
     url = push['repository']['url']
     user = push['repository']['owner']['name']
     repo = push['repository']['name']
@@ -96,6 +96,7 @@ class GitDub
     @github.each do |entry|
       if "#{user}\/#{repo}" =~ Regexp.new(entry['id'])
         opts.merge!(entry.reject { |k, v| k == 'id' })
+        opts['uri'] ||= url
 
         dir = File.join(user, repo)
         if not Dir.exists?(dir)
@@ -112,13 +113,12 @@ class GitDub
           end
         end
 
-        opts = opts.merge({uri: entry['uri'] ? entry['uri'] : url})
-
         state_file = File.join(dir, GitNotifier::STATE_FILE)
         if @silent_init and not File.exists?(state_file)
           $logger.info("configuring git-notifer for silent update")
-          opts = opts.merge({updateonly: true}) unless File.exists?(state_file)
+          opts['updateonly'] = true unless File.exists?(state_file)
         end
+
         return GitNotifier.run(dir, opts)
       end
     end