diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-05-02 11:49:18 -0400 |
|---|---|---|
| committer | Jenkins <jenkins@review.openstack.org> | 2013-05-06 16:45:40 +0000 |
| commit | 6d656500f5068de3bac541974b2d4a17953cc4b3 (patch) | |
| tree | 5f5771ed1458297c469f4469f642b79bc8d5bb05 | |
| parent | 52fb3618ed72f4c0a4e17e70e3c0a02c2b7afb1e (diff) | |
| download | pbr-6d656500f5068de3bac541974b2d4a17953cc4b3.tar.gz | |
Default to single-version-externally-managed0.5.10
The other thing is always confusing and never what people want.
Change-Id: I915f561da2f74048c24dd324dbe71b5446d39197
Reviewed-on: https://review.openstack.org/28060
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
| -rw-r--r-- | pbr/hooks.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py index d3d691c..7a61ece 100644 --- a/pbr/hooks.py +++ b/pbr/hooks.py @@ -51,10 +51,10 @@ pbr.packaging.LocalBuildLatex """ pbr_config = config.get('pbr', dict()) - if (packaging.get_boolean_option(pbr_config, - 'single-version-externally-mananged', - 'SINGLE_VERSION_EXTERNALLY_MANANGED') - or 'manpages' in pbr_config): + use_egg = packaging.get_boolean_option( + pbr_config, 'use-egg', 'PBR_USE_EGG') + # We always want non-egg install unless explicitly requested + if 'manpages' in pbr_config or not use_egg: config['global']['commands'] = config['global']['commands'] + """ pbr.packaging.DistutilsInstall """ |