diff options
| author | Jeffrey J McCune <jeff@northstarlabs.net> | 2008-01-19 16:34:48 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-17 10:41:12 +1100 |
| commit | 0eede7604d9da9b453d48465b06de9813602c09b (patch) | |
| tree | 2391801925a01b86b1177bf8529adbd871567b02 | |
| parent | c34982439dce7fbd7a9686f2f73cc170d994ab50 (diff) | |
| download | puppet-0eede7604d9da9b453d48465b06de9813602c09b.tar.gz puppet-0eede7604d9da9b453d48465b06de9813602c09b.tar.xz puppet-0eede7604d9da9b453d48465b06de9813602c09b.zip | |
Fixed Ticket 1009 - problem with plist xml parser. We do not need the plist parser for pkgdmg.
| -rw-r--r-- | lib/puppet/provider/package/pkgdmg.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 2020b6b56..2614d0950 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -145,11 +145,8 @@ file system and not via a URL method." begin open(cached_source) do |dmg| 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| - entity['mount-point'] - }.select { |mountloc|; mountloc } + # JJM THIS IS A HORRIBLE HACK (Well, actually it's not so bad...) + mounts = xml_str.scan(/<string>(\/tmp.*?)<\/string>/)[0] begin mounts.each do |fspath| Dir.entries(fspath).select { |f| |