dply 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4d1e103de385380812dbb80962948bdada9d958
-  data.tar.gz: 06a06f6e1bd0b850633493580109c1477108dfc5
+  metadata.gz: bf43174e5252c0faeb8aef5c900dc0cf0c988fc1
+  data.tar.gz: 4dae0c3e99804ae6d9feab5a8d8ae875681122e0
 SHA512:
-  metadata.gz: 4e01402487708e257bd4c94c739f059798b1d4597e4ff06986be7c44a005a055349d9c32d6faed36c103c7a778ab6d079c63e32f2e1d8552467e8a9aca319c22
-  data.tar.gz: 04971dda86f69b50af9f26ee4c9303416b69ddd1b20fbba88af279417960955b0433a795016fcad109f449b9d1580e7d88509315e6441191ad485d09bebd2c01
+  metadata.gz: c43c24b1062726c5372ad4a350e54abde63557ea97722f2b6902e7be6cb3389f68c301d3eef900aa0c783fdbf206a0616070b825bec49e6dacc727840d6b2506
+  data.tar.gz: d892b00aa2efadefbb6b024a47fad9623aff43d680085ae61613d51da2e32775d7f0e2c8d1038b22490d4387d9a0004d17a1987f27968f1baa74ee5a2dc13873

data/lib/dply/deplist.rb

@@ -28,6 +28,11 @@ module Dply
         @libs_files_map = libs_files_map
         libs = @libs_files_map.keys
 
+        if logger.debug?
+          require 'pp'
+          pp @libs_files_map
+        end
+
         deps = rpm.libs_packages_map libs
         verify_deps(deps, pkgs_list)
       end
@@ -81,9 +86,10 @@ module Dply
       path = Pathname.new(file)
       Elf::File.open(file) do |ef|
         return [] if not ef.has_section? ".dynamic"
+        lib_type = ef.elf_class.desc == "64-bit" ? "()(64bit)" : ""
         dynamic = ef[".dynamic"].needed_libraries.keys
         rpath = ef[".dynamic"].rpath.map { |i| i.sub("$ORIGIN", "#{path.dirname}") }
-        external = dynamic.reject { |l| lib_in_rpath? l, rpath }
+        external = dynamic.reject { |l| lib_in_rpath? l, rpath }.map { |l| "#{l}#{lib_type}" }
         logger.debug { "[#{file}]: dynamic:#{dynamic.size} rpath:#{dynamic.size - external.size} ext:#{external.size}" } if logger.debug?
         external
       end

data/lib/dply/rpm.rb

@@ -4,6 +4,8 @@ module Dply
   class Rpm
     include Helper
 
+    # libs should include ()(64bit) in their name if 64bit libs
+
     def libs_packages_map(libs)
       h = {}
       libs.each do |lib|
@@ -21,7 +23,6 @@ module Dply
     end
 
     def whatprovides(lib)
-      lib = "#{lib}()(64bit)"
       command = ["rpm", "--queryformat", "%{NAME} ", "-q", "--whatprovides", lib]
       output = cmd command, return_output: true, display: false
       list = output.strip.split.select {|pkg| not filtered? pkg }

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf