diff options
| author | Michael V. O'Brien <michael@reductivelabs.com> | 2007-09-11 14:18:43 -0500 |
|---|---|---|
| committer | Michael V. O'Brien <michael@reductivelabs.com> | 2007-09-11 14:18:43 -0500 |
| commit | 36e24e28b2433c2306b5f3edd6f61197f4ea7bb2 (patch) | |
| tree | 8c0d6954755cacbf49ab175021afd44bd4ccdf8e /lib | |
| parent | 6f9a444bba13f134c2395dd52a3816ab7ec3031c (diff) | |
| parent | 81149333c360d6f10e6c1cf58f43b6e18c0a55dc (diff) | |
| download | puppet-36e24e28b2433c2306b5f3edd6f61197f4ea7bb2.tar.gz puppet-36e24e28b2433c2306b5f3edd6f61197f4ea7bb2.tar.xz puppet-36e24e28b2433c2306b5f3edd6f61197f4ea7bb2.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/handler/node.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/provider/package/pkgdmg.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/handler/node.rb b/lib/puppet/network/handler/node.rb index bf2424b18..f93087a2f 100644 --- a/lib/puppet/network/handler/node.rb +++ b/lib/puppet/network/handler/node.rb @@ -98,7 +98,7 @@ class Puppet::Network::Handler::Node < Puppet::Network::Handler names = node_names(key, facts) names.each do |name| name = name.to_s if name.is_a?(Symbol) - if node = nodesearch(name) + if node = nodesearch(name) and @source != "none" Puppet.info "Found %s in %s" % [name, @source] break end diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 36f2da6c7..c068129ca 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -146,7 +146,7 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg: begin open(cached_source) do |dmg| - xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "-noidme", "/tmp", dmg.path + xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path ptable = Plist::parse_xml xml_str # JJM Filter out all mount-paths into a single array, discard the rest. mounts = ptable['system-entities'].collect { |entity| |