[DRE-commits] [librarian-puppet] 79/97: Merge pull request #172 from rodjek/issue-172

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository librarian-puppet.

commit 9ba02d682074bb94ff4dc92ebbd2f67bb67f5594
Merge: 2f9eba0 21a53fc
Author: Carlos Sanchez <github at carlossanchez.eu>
Date:   Fri Feb 7 21:25:41 2014 +0100

    Merge pull request #172 from rodjek/issue-172
    
    Librarian-puppet package seems to get into an infinite loop

 features/package.feature             | 17 ++++++++++++
 lib/librarian/puppet/cli.rb          |  1 +
 lib/librarian/puppet/source/forge.rb | 51 +++++++++++++++++++++++++-----------
 3 files changed, 53 insertions(+), 16 deletions(-)

diff --cc lib/librarian/puppet/source/forge.rb
index 7dbdf49,740c393..d4efe3d
--- a/lib/librarian/puppet/source/forge.rb
+++ b/lib/librarian/puppet/source/forge.rb
@@@ -140,11 -143,20 +146,13 @@@ module Libraria
              end
            end
  
 -          def debug(*args, &block)
 -            environment.logger.debug(*args, &block)
 -          end
 -          def info(*args, &block)
 -            environment.logger.info(*args, &block)
 -          end
 -
          private
-           def api_data
-             return @api_data if @api_data
+ 
+           # get and cache the API data for a specific module with all its versions and dependencies
+           def api_data(module_name)
+             return @api_data[module_name] if @api_data
              # call API and cache data
-             @api_data = api_call(name)
+             @api_data = api_call(module_name)
              if @api_data.nil?
                raise Error, "Unable to find module '#{name}' on #{source}"
              end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git