From 545a8d046d2692ac1d020df60951e9bcf04b3a7c Mon Sep 17 00:00:00 2001 From: Pranay Kanwar Date: Mon, 8 Apr 2013 13:50:02 +0000 Subject: [PATCH] #396 Convert all != dependencies to Conflicts --- lib/fpm/package/rpm.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb index 70c7c6ef56..a9581ad452 100644 --- a/lib/fpm/package/rpm.rb +++ b/lib/fpm/package/rpm.rb @@ -161,16 +161,14 @@ def converted_from(origin) end # Convert != dependency as Conflict =, as rpm doesn't understand != - if origin == FPM::Package::Python - self.dependencies = self.dependencies.select do |dep| - name, op, version = dep.split(/\s+/) - dep_ok = true - if op == '!=' - self.conflicts << "#{name} = #{version}" - dep_ok = false - end - dep_ok + self.dependencies = self.dependencies.select do |dep| + name, op, version = dep.split(/\s+/) + dep_ok = true + if op == '!=' + self.conflicts << "#{name} = #{version}" + dep_ok = false end + dep_ok end # Convert any dashes in version strings to underscores.