[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, master, updated. debian/1.6.10-1-203-g1dd0cd5

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit e3f31f175cdaca7e57ee36f1c29b1a49001bb288
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Thu Jan 3 00:09:18 2013 +0100

    Refresh rubygems patch

diff --git a/debian/patches/no-require-rubygems b/debian/patches/no-require-rubygems
index 8ecd973..7ad127f 100644
--- a/debian/patches/no-require-rubygems
+++ b/debian/patches/no-require-rubygems
@@ -3,13 +3,23 @@ Forwarded: not-needed
 Subject: Do not require rubygems
  We do not require rubygems; the apt repository should contain all
  dependencies.
---- a/lib/facter/application.rb
-+++ b/lib/facter/application.rb
-@@ -35,7 +35,6 @@
-       # Print the facts as JSON and exit
-       if options[:json]
-         begin
--          require 'rubygems'
-           require 'json'
-           puts JSON.dump(facts)
-           exit(0)
+--- a/bin/facter
++++ b/bin/facter
+@@ -55,17 +55,6 @@
+ # Copyright (c) 2011 Puppet Labs, Inc
+ # Licensed under the Apache 2.0 license
+ 
+-# Bundler and rubygems maintain a set of directories from which to
+-# load gems. If Bundler is loaded, let it determine what can be
+-# loaded. If it's not loaded, then use rubygems. But do this before
+-# loading any facter code, so that our gem loading system is sane.
+-if not defined? ::Bundler
+-  begin
+-    require 'rubygems'
+-  rescue LoadError
+-  end
+-end
+-
+ require 'facter/application'
+ 
+ Facter::Application.run(ARGV)

-- 
Packaging of Facter for debian