gitorious.rb in autoproj-1.7.13

- old
+ new

@@ -51,10 +51,11 @@
         # If running on a recent enough autobuild version, register a fallback to
         # use http when git fails
         if Autobuild::Importer.respond_to?(:fallback) && options[:fallback_to_http]
             Autobuild::Importer.fallback do |package, importer|
                 root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
+
                 if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
                     Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
 
                     base_replace_string = "http://git.#{base_url}"
                     Autobuild::Package.each do |pkg_name, pkg|
@@ -85,12 +86,12 @@
                 url += ".git"
             end
             if url !~ /^\//
                 url = "/#{url}"
             end
-            base_url = Autoproj.user_config("#{name}_ROOT")
-            base_push_url = Autoproj.user_config("#{name}_PUSH_ROOT")
-            return Hash[:type => 'git', :url => "#{base_url}#{url}", :push_to => "#{base_push_url}#{url}"].merge(options)
+            pull_base_url = Autoproj.user_config("#{name}_ROOT")
+            push_base_url = Autoproj.user_config("#{name}_PUSH_ROOT")
+            Hash[:type => 'git', :url => "#{pull_base_url}#{url}", :push_to => "#{push_base_url}#{url}"].merge(options)
         end
     end
 end
 