[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.1-1-48-g344142f

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit e7f842c3b5b41396c28925e82e4e1cfcb61eda41
Merge: bafc027e5c45f558bb24bd047a1444d770ffb14b bbdf47ad148cdc756dc10fc8358aa2c90b1ed9f9
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Sat Oct 2 12:58:49 2010 +0200

    Merge branch 'upstream'

diff --combined install.rb
index 37786a7,449223d..b61fa2d
--- a/install.rb
+++ b/install.rb
@@@ -88,6 -88,7 +88,7 @@@ libs  = glob(%w{lib/**/*.rb lib/**/*.p
  tests = glob(%w{test/**/*.rb})
  
  def do_bins(bins, target, strip = 's?bin/')
+   Dir.mkdir(target) unless File.directory? target
    bins.each do |bf|
      obf = bf.gsub(/#{strip}/, '')
      install_binfile(bf, obf, target)
@@@ -154,10 -155,12 +155,12 @@@ en
  # Prepare the file installation.
  #
  def prepare_installation
+   $operatingsystem = Facter["operatingsystem"].value
+ 
    # Only try to do docs if we're sure they have rdoc
    if $haverdoc
      InstallOptions.rdoc  = true
-     InstallOptions.ri  = RUBY_PLATFORM != "i386-mswin32"
+     InstallOptions.ri  = $operatingsystem != "windows"
    else
      InstallOptions.rdoc  = false
      InstallOptions.ri  = false
@@@ -166,7 -169,7 +169,7 @@@
  
    if $haveman
      InstallOptions.man = true
-     if RUBY_PLATFORM == "i386-mswin32"
+     if $operatingsystem == "windows"
        InstallOptions.man  = false
      end
    else
@@@ -175,15 -178,6 +178,6 @@@
  
    InstallOptions.tests = true
  
-   if $haveman
-     InstallOptions.man = true
-     if RUBY_PLATFORM == "i386-mswin32"
-       InstallOptions.man  = false
-     end
-   else
-     InstallOptions.man = false
-   end
- 
    ARGV.options do |opts|
      opts.banner = "Usage: #{File.basename($0)} [options]"
      opts.separator ""
@@@ -418,7 -412,7 +412,7 @@@ def install_binfile(from, op_file, targ
      end
    end
  
-   if Config::CONFIG["target_os"] =~ /win/io and Config::CONFIG["target_os"] !~ /darwin/io
+   if $operatingsystem == "windows"
      installed_wrapper = false
  
      if File.exists?("#{from}.bat")
@@@ -464,8 -458,8 +458,8 @@@ prepare_installatio
  #run_tests(tests) if InstallOptions.tests
  #build_rdoc(rdoc) if InstallOptions.rdoc
  #build_ri(ri) if InstallOptions.ri
 -#build_man(bins, sbins) if InstallOptions.man
 +build_man(bins, sbins) if InstallOptions.man
  do_bins(sbins, InstallOptions.sbin_dir)
  do_bins(bins, InstallOptions.bin_dir)
  do_libs(libs)
- do_man(man)
+ do_man(man) if InstallOptions.man
diff --combined spec/spec_helper.rb
index 1baec4a,b5b2738..270ba01
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -12,7 -12,7 +12,7 @@@ ARGV.clea
  
  require 'puppet'
  require 'mocha'
 -gem 'rspec', '>=1.2.9'
 +#gem 'rspec', '>=1.2.9'
  require 'spec/autorun'
  
  # So everyone else doesn't have to include this base constant.
@@@ -20,6 -20,7 +20,7 @@@ module PuppetSpe
    FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
  end
  
+ require 'spec/lib/puppet_spec/files'
  require 'monkey_patches/alias_should_to_must'
  require 'monkey_patches/add_confine_and_runnable_to_rspec_dsl'
  require 'monkey_patches/publicize_methods'

-- 
Puppet packaging for Debian