Browse Source

fix incorrect version detection when building distro-specific packages

This was broken since fe2e77c3b9dc5845c802ff096c1f6e45fe979c96,
as fpm is now called in the host environment. As the version is
available only for .deb packages and those will be deprecated in
the upcoming release, just record a dependency on the package.

Closes #2572
Ashish Kulkarni 9 years ago
parent
commit
8f036308f6
2 changed files with 3 additions and 8 deletions
  1. 2 0
      CHANGELOG.md
  2. 1 8
      scripts/build.py

+ 2 - 0
CHANGELOG.md

@@ -16,6 +16,8 @@ v0.12.3 (unreleased)
 * **#2322**: fix broken debug builds with MSVC
 * **#2355**: add support for proxy bypass for specific hosts with --bypass-proxy-for
 * **#2418**: fix build error on OS X
+* **#2560**: allow using email address as proxy username
+* **#2572**: fix incorrect version detection when building distro-specific packages
 
 v0.12.2.1 (2015-01-19)
 ----------------------

+ 1 - 8
scripts/build.py

@@ -580,14 +580,7 @@ def fpm_params(cfg, ver):
         output += '.rpm -t rpm --rpm-compression %s --epoch 1' % setup['compression']
 
     for depend in setup['runtime_packages'].split():
-        if setup['packaging_tool'] == 'apt':
-            version = get_output('dpkg-query', '-W', '-f=${Version}', depend)
-            if version:
-                output += ' --depends "%s >= %s"' % (depend, version)
-            else:
-                output += ' --depends %s' % depend
-        elif setup['packaging_tool'] == 'yum':
-            output += ' --depends %s' % depend
+        output += ' --depends %s' % depend
 
     output += ' .'
     return output