summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 08:16:16 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 08:16:16 -0700
commit603c8f8c87c1b08d58ac0b240c1ad70a928e113d (patch)
treef4401a44754558434dca12c22edf54035130d5a4 /setup.py
parentfc5e1c6f0bee14fdb85ad138324062ceaa598eee (diff)
parente21c310ced6992cf2eb33b372cd4e5e69a79d140 (diff)
downloadnova-603c8f8c87c1b08d58ac0b240c1ad70a928e113d.tar.gz
nova-603c8f8c87c1b08d58ac0b240c1ad70a928e113d.tar.xz
nova-603c8f8c87c1b08d58ac0b240c1ad70a928e113d.zip
merged trunk
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 0fd286f7d..1767b00f4 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,10 @@ class local_sdist(sdist):
def run(self):
if os.path.isdir('.bzr'):
# We're in a bzr branch
- log_cmd = subprocess.Popen(["bzr", "log", "--gnu"],
- stdout=subprocess.PIPE)
+ env = os.environ.copy()
+ env['BZR_PLUGIN_PATH'] = os.path.abspath('./bzrplugins')
+ log_cmd = subprocess.Popen(["bzr", "log", "--novalog"],
+ stdout=subprocess.PIPE, env=env)
changelog = log_cmd.communicate()[0]
with open("ChangeLog", "w") as changelog_file:
changelog_file.write(changelog)
@@ -52,5 +54,5 @@ setup(name='nova',
'bin/nova-manage',
'bin/nova-network',
'bin/nova-objectstore',
- 'bin/nova-rsapi',
+ 'bin/nova-api-new',
'bin/nova-volume'])