[DRE-commits] [rubygems-integration] 01/02: Revert "Install to $HOME if not root"
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Aug 29 23:12:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rubygems-integration.
commit 992528e77fb185e13c5bb31baced8759235996c8
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date: Fri Aug 29 16:11:39 2014 -0700
Revert "Install to $HOME if not root"
This reverts commit b9453bd63b15f69778f48610a2409ac615afe4d3.
---
debian/changelog | 3 +--
lib/rubygems/defaults/operating_system.rb | 17 +++--------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c5337f..a255e9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,8 @@ rubygems-integration (1.8) UNRELEASED; urgency=medium
* Improve smoke tests in debian/tests/package-list.
.
- Test a gem installed together with the interpreter, one arch:all and one
+ Test and gem installed together with the interpreter, one arch:all and one
arch:any
- * Install to $HOME if not being run as root
-- Antonio Terceiro <terceiro at debian.org> Wed, 30 Apr 2014 11:11:12 -0300
diff --git a/lib/rubygems/defaults/operating_system.rb b/lib/rubygems/defaults/operating_system.rb
index a517e02..b443c85 100644
--- a/lib/rubygems/defaults/operating_system.rb
+++ b/lib/rubygems/defaults/operating_system.rb
@@ -1,25 +1,15 @@
unless ENV['DEBIAN_DISABLE_RUBYGEMS_INTEGRATION']
-require 'etc'
-
class << Gem
alias :upstream_default_dir :default_dir
def default_dir
- if Etc.getpwuid.uid == 0
- File.join('/', 'var', 'lib', 'gems', Gem::ConfigMap[:ruby_version])
- else
- user_dir
- end
+ File.join('/', 'var', 'lib', 'gems', Gem::ConfigMap[:ruby_version])
end
alias :upstream_default_bindir :default_bindir
def default_bindir
- if Etc.getpwuid.uid == 0
- File.join('/', 'usr', 'local', 'bin')
- else
- File.join(user_dir, 'bin')
- end
+ File.join('/', 'usr', 'local', 'bin')
end
alias :upstream_default_path :default_path
@@ -30,11 +20,10 @@ class << Gem
end
upstream_default_path + [
- File.join('/', 'var', 'lib', 'gems', Gem::ConfigMap[:ruby_version]),
File.join('/usr/share/rubygems-integration', Gem::ConfigMap[:ruby_version]),
extra_path,
'/usr/share/rubygems-integration/all'
- ].compact.uniq
+ ].compact
end
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rubygems-integration.git
More information about the Pkg-ruby-extras-commits
mailing list