← Back to branch summary

~gandelman-a/ubuntu/precise/facter/merge922788

« back to all changes in this revision

Viewing changes to lib/facter/util/processor.rb

  • Committer: Adam Gandelman
  • Date: 2012-01-27 19:52:39 UTC
  • mfrom: (3.1.14 sid)
  • Revision ID: adamg@canonical.com-20120127195239-32vs39kldt00pzcq
http://bugs.debian.org/651501
https://launchpad.net/bugs/408402
https://launchpad.net/bugs/922788
* Merge from Debian testing (LP: #922788). Remaining changes:
  - debian/rules: use what we had in natty; we don't want ruby-pkg-tools
    in main. (LP: #408402)
  - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends
    even tho Debian has moved to gem2deb (not in main). Move ruby-json to
    Suggests.
  - debian/rules: Use dh_prep instead of dh_clean, add build-arch +
    build-indep targets
  - debian/control: Make binary package depend on ruby1.8 explicitly.
* Dropped changes:
  - debian/control: Update debhelper Build-Depends to 8 (Updated in Debian)
* Move dmidecode from Depends to Recommends (Closes: #651501)
* New upstream release
* Add dependency on dmidecode
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/facter/util/processor.rb
21
21
            end
22
22
          end
23
23
        end
24
 
       
 
24
 
25
25
      when "ppc64"
26
26
        Thread::exclusive do
27
27
          File.readlines(cpuinfo).each do |l|
33
33
            end
34
34
          end
35
35
        end
36
 
          
 
36
 
37
37
      when /arm/
38
38
        Thread::exclusive do
39
39
          File.readlines(cpuinfo).each do |l|
63
63
    end
64
64
    processor_list
65
65
  end
66
 
  
 
66
 
67
67
  def self.enum_lsdev
68
68
    processor_num = -1
69
69
    processor_list = {}