[DRE-commits] [librarian-puppet] 90/97: Revert "Issue #167 Require open3_backport in ruby 1.8 and install if not present"
Stig Sandbeck Mathisen
ssm at debian.org
Tue Mar 11 12:12:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ssm pushed a commit to branch master
in repository librarian-puppet.
commit 87034a6a5cb570acf1350cd9499722be3753162c
Author: Carlos Sanchez <csanchez at maestrodev.com>
Date: Tue Feb 11 18:53:25 2014 +0100
Revert "Issue #167 Require open3_backport in ruby 1.8 and install if not present"
This reverts commit 89ae7f2e479587a6bfc19457211af7d54f4857de.
---
lib/librarian/puppet.rb | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/lib/librarian/puppet.rb b/lib/librarian/puppet.rb
index 5ff6080..320a8c2 100644
--- a/lib/librarian/puppet.rb
+++ b/lib/librarian/puppet.rb
@@ -1,18 +1,7 @@
require 'librarian'
require 'fileutils'
require 'open3'
-
-# require open3_backport in ruby 1.8 and install if not present
-# https://github.com/rodjek/librarian-puppet/issues/167
-if RUBY_VERSION < '1.9'
- begin
- require 'open3_backport'
- rescue LoadError
- require 'rubygems/dependency_installer.rb'
- Gem::DependencyInstaller.new.install 'open3_backport'
- require 'open3_backport'
- end
-end
+require 'open3_backport' if RUBY_VERSION < '1.9'
status = nil
out = nil
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git
More information about the Pkg-ruby-extras-commits
mailing list