Merge pull request #2303 from influxdata/feature/rpm-shadow-utils

Add shadow-utils to release RPM generation
pull/10616/head
Chris Goller 2017-11-08 11:55:40 -06:00 committed by GitHub
commit c1c5a2fbbe
2 changed files with 2 additions and 2 deletions

View File

@ -6,9 +6,9 @@
1. [#1077](https://github.com/influxdata/chronograf/pull/2087): Fix Chronograf requiring Telegraf's CPU and system plugins to ensure that all Apps appear on the HOST LIST page. 1. [#1077](https://github.com/influxdata/chronograf/pull/2087): Fix Chronograf requiring Telegraf's CPU and system plugins to ensure that all Apps appear on the HOST LIST page.
1. [#2222](https://github.com/influxdata/chronograf/pull/2222): Fix template variables in dashboard query building. 1. [#2222](https://github.com/influxdata/chronograf/pull/2222): Fix template variables in dashboard query building.
1. [#2291](https://github.com/influxdata/chronograf/pull/2291): Fix several kapacitor alert creation panics. 1. [#2291](https://github.com/influxdata/chronograf/pull/2291): Fix several kapacitor alert creation panics.
1. [#2303](https://github.com/influxdata/chronograf/pull/2303): Add shadow-utils to RPM release packages
1. [#2292](https://github.com/influxdata/chronograf/pull/2292): Source extra command line options from defaults file 1. [#2292](https://github.com/influxdata/chronograf/pull/2292): Source extra command line options from defaults file
### Features ### Features
### UI Improvements ### UI Improvements

View File

@ -674,7 +674,7 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
package_build_root, package_build_root,
current_location) current_location)
if package_type == "rpm": if package_type == "rpm":
fpm_command += "--depends coreutils" fpm_command += "--depends coreutils --depends shadow-utils"
# TODO: Check for changelog # TODO: Check for changelog
# elif package_type == "deb": # elif package_type == "deb":
# fpm_command += "--deb-changelog {} ".format(os.path.join(os.getcwd(), "CHANGELOG.md")) # fpm_command += "--deb-changelog {} ".format(os.path.join(os.getcwd(), "CHANGELOG.md"))