← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ohai/trusty

« back to all changes in this revision

Viewing changes to lib/ohai/mixin/command.rb

  • Committer: Bazaar Package Importer
  • Author(s): Bryan McLellan, Joshua Timberman, Bryan McLellan
  • Date: 2010-01-07 12:51:20 UTC
  • mfrom: (1.1.3 upstream) (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100107125120-5hsbuzcga2rblizl
Tags: 0.3.6-1
[Joshua Timberman]
* Add DRE team to uploaders.
* Bump standards version to 3.8.3 

[Bryan McLellan]
* New upstream release
* Add Joshua Timberman to uploaders
* Add ohai as suggests to libohai-ruby
* Update watch to use githubredir
* Add quilt patch to remove rubygems require
* Remove package man page in favor of upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ohai/mixin/command.rb
109
109
        unless args[:group].kind_of?(Integer)
110
110
          args[:group] = Etc.getgrnam(args[:group]).gid if args[:group]
111
111
        end
112
 
        args[:environment] ||= nil
 
112
        args[:environment] ||= {}
 
113
 
 
114
        # Default on C locale so parsing commands output can be done
 
115
        # independently of the node's default locale.
 
116
        # "LC_ALL" could be set to nil, in which case we also must ignore it.
 
117
        unless args[:environment].has_key?("LC_ALL")
 
118
          args[:environment]["LC_ALL"] = "C"
 
119
        end
113
120
        
114
121
        pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
115
122
 
143
150
              Process.gid = args[:group]
144
151
            end
145
152
            
146
 
            if args[:environment]
147
 
              args[:environment].each do |key,value|
148
 
                ENV[key] = value
149
 
              end
 
153
            args[:environment].each do |key,value|
 
154
              ENV[key] = value
150
155
            end
151
156
            
152
157
            begin