Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-stdlib
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.3.0
Choose a base ref
...
head repository: puppetlabs/puppetlabs-stdlib
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.3.1
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 13, 2012

  1. (#13091) Fix LoadError exception with puppet apply

    Puppet apply does not add the stdlib lib directory to the $LOAD_PATH.
    This is a problem because the puppet_vardir fact requires the
    puppet_settings library to be available for the `with_puppet` utility
    method.
    
    Without this patch, puppet apply will result in the following error:
    
        $ puppet apply --modulepath=/vagrant/modules -e 'notice $puppet_vardir'
        warning: Could not load fact file stdlib/lib/facter/puppet_vardir.rb: no such file to load -- facter/util/puppet_settings
        notice: Scope(Class[main]):
        notice: Finished catalog run in 0.01 seconds
    
    With this patch applied, puppet apply works as expected:
    
        $ puppet apply --modulepath=/vagrant/modules.pe -e 'notice $puppet_vardir'
        notice: Scope(Class[main]): /Users/jeff/.puppet/var
        notice: Finished catalog run in 0.01 seconds
    
    This patch defensively tries to load facter/util/puppet_settings.  If it cannot
    load it, it falls back to trying to explicitly locate and load the library.
    
    Once puppet is fixed such that a modules lib directory is truly in the
    $LOAD_PATH, the fall back implementation will no longer be exercised since the
    LoadError should not be raised.
    Jeff McCune committed Mar 13, 2012
    Configuration menu
    Copy the full SHA
    ea43e86 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2012

  1. Merge pull request #50 from jeffmccune/ticket/2.3.x/13091_stdlib_thro…

    …ws_a_loaderror_when_running_with_puppet_apply
    
    (#13091) Fix LoadError exception with puppet apply
    kbarber committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    b4b809e View commit details
    Browse the repository at this point in the history
  2. Update CHANGELOG and Modulefile for 2.3.1

    Jeff McCune committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    6b8f9dd View commit details
    Browse the repository at this point in the history
Loading