← Back to branch summary

~ubuntu-branches/ubuntu/quantal/puppet/quantal

« back to all changes in this revision

Viewing changes to lib/puppet/module_tool/dependency.rb

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-14 01:56:30 UTC
  • mfrom: (1.1.29) (3.1.43 sid)
  • Revision ID: package-import@ubuntu.com-20120714015630-ntj41rkvkq4zph4y
Tags: 2.7.18-1ubuntu1
https://launchpad.net/bugs/1023931
* Resynchronise with Debian. (LP: #1023931) Remaining changes:
  - debian/puppetmaster-passenger.postinst: Make sure we error if puppet
    config print doesn't work
  - debian/puppetmaster-passenger.postinst: Ensure upgrades from
    <= 2.7.11-1 fixup passenger apache configuration.
* Dropped upstreamed patches:
  - debian/patches/CVE-2012-1906_CVE-2012-1986_to_CVE-2012-1989.patch
  - debian/patches/puppet-12844
  - debian/patches/2.7.17-Puppet-July-2012-CVE-fixes.patch
* Drop Build-Depends on ruby-rspec (in universe):
  - debian/control: remove ruby-rspec from Build-Depends
  - debian/patches/no-rspec.patch: make Rakefile work anyway if rspec
    isn't installed so we can use it in debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/module_tool/dependency.rb
1
 
module Puppet::Module::Tool
 
1
module Puppet::ModuleTool
2
2
 
3
3
  class Dependency
4
4
 
8
8
    def initialize(full_module_name, version_requirement = nil, repository = nil)
9
9
      @full_module_name = full_module_name
10
10
      # TODO: add error checking, the next line raises ArgumentError when +full_module_name+ is invalid
11
 
      @username, @name = Puppet::Module::Tool.username_and_modname_from(full_module_name)
 
11
      @username, @name = Puppet::ModuleTool.username_and_modname_from(full_module_name)
12
12
      @version_requirement = version_requirement
13
 
      @repository = repository ? Repository.new(repository) : nil
 
13
      @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
14
14
    end
15
15
 
16
16
    # Return PSON representation of this data.