Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #221 from svenihoney/debian_fix_unequal

Introduced a dependency mapping for != dependency using Conflicts in deb instead of a Depends
  • Loading branch information...
commit ac5a3995cf59f149644f2bde196b26ee82c3ea94 2 parents 7ec2dd5 + 0182d6f
@jordansissel authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 lib/fpm/package/deb.rb
View
4 lib/fpm/package/deb.rb
@@ -261,6 +261,10 @@ def fix_dependency(dep)
nextversion[l-1] = 0
nextversion = nextversion.join(".")
return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+ elsif (m = dep.match(/(\S+)\s+\(!= (.+)\)/))
+ # Append this to conflicts
+ self.conflicts += [dep.gsub(/!=/,"=")]
+ return []
elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) and
self.attributes[:deb_ignore_iteration_in_dependencies?]
# Convert 'foo (= x)' to 'foo (>= x)' and 'foo (<< x+1)'
Please sign in to comment.
Something went wrong with that request. Please try again.