Skip to content

Commit 2937fb2

Browse files
authored
Merge pull request #4 from agrare/fix_rpm_package_version
Do not use headerNVR in Package.version
2 parents b5d9a1e + 2b0a9d2 commit 2937fb2

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

lib/rpm/package.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,7 @@ def arch
261261

262262
# @return [Version] Version for this package
263263
def version
264-
v_ptr = ::FFI::MemoryPointer.new(:pointer, 1)
265-
r_ptr = ::FFI::MemoryPointer.new(:pointer, 1)
266-
267-
RPM::C.headerNVR(ptr, nil, v_ptr, r_ptr)
268-
v = v_ptr.read_pointer.read_string
269-
r = r_ptr.read_pointer.read_string
270-
v_ptr.free
271-
r_ptr.free
272-
Version.new(v, r, self[:epoch])
264+
Version.new(self[:version], self[:release], self[:epoch])
273265
end
274266

275267
# String representation of the package: "name-version-release-arch"

test/test_package.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def test_open
1313
req = RPM::Require.new('simple', RPM::Version.new('1.0', '0'), RPM::SENSE_GREATER | RPM::SENSE_EQUAL, nil)
1414
assert req.satisfy?(pkg)
1515

16-
skip("NoMethodError: undefined method `headerNVR' for module RPM::C")
1716
assert_equal 'simple-1.0-0-i586', pkg.to_s
1817

1918
assert_equal '3b5f9d468c877166532c662e29f43bc3', pkg.signature

test/test_transaction.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ def test_install_and_remove
125125
end
126126

127127
def test_install_with_custom_callback
128-
skip("NoMethodError: undefined method `headerNVR' for RPM::C:Module")
129128
pkg = RPM::Package.open(fixture(PACKAGE_FILENAME))
130129

131130
Dir.mktmpdir do |dir|

0 commit comments

Comments
 (0)