diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-02 07:20:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-02 07:20:53 +0000 |
| commit | 6c240ac7c7e6cbd6d2ef9462e8d1e5639765e4aa (patch) | |
| tree | 8e83b202d3368ae6ec21df9ffe4dff27e57104d2 /openstack/common | |
| parent | 079927a6d8953377d1923269213cdbdadc3633c1 (diff) | |
| parent | 4a7f7a5ba74de2712d8499ae07058e7cfa6e5299 (diff) | |
| download | oslo-6c240ac7c7e6cbd6d2ef9462e8d1e5639765e4aa.tar.gz oslo-6c240ac7c7e6cbd6d2ef9462e8d1e5639765e4aa.tar.xz oslo-6c240ac7c7e6cbd6d2ef9462e8d1e5639765e4aa.zip | |
Merge "Fix errors reported by pyflakes."
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index 59f255d..628f5e3 100644 --- a/openstack/common/setup.py +++ b/openstack/common/setup.py @@ -52,7 +52,6 @@ def canonicalize_emails(changelog, mapping): # Get requirements from the first file that exists def get_reqs_from_files(requirements_files): - reqs_in = [] for requirements_file in requirements_files: if os.path.exists(requirements_file): return open(requirements_file, 'r').read().split('\n') @@ -144,8 +143,8 @@ def _get_git_next_version_suffix(branch_name): # where the bit after the last . is the short sha, and the bit between # the last and second to last is the revno count (revno, sha) = post_version.split(".")[-2:] - first_half = "%(milestonever)s~%(datestamp)s" % locals() - second_half = "%(revno_prefix)s%(revno)s.%(sha)s" % locals() + first_half = "%s~%s" % (milestonever, datestamp) + second_half = "%s%s.%s" % (revno_prefix, revno, sha) return ".".join((first_half, second_half)) |