← Back to team overview

harvest-dev team mailing list archive

[Merge] lp:~dholbach/harvest/918150 into lp:harvest

 

Daniel Holbach has proposed merging lp:~dholbach/harvest/918150 into lp:harvest.

Requested reviews:
  harvest-dev (harvest-dev)
Related bugs:
  Bug #918150 in harvest: "We need to set BZR_LOG for the updatelists command"
  https://bugs.launchpad.net/harvest/+bug/918150

For more details, see:
https://code.launchpad.net/~dholbach/harvest/918150/+merge/89016
-- 
https://code.launchpad.net/~dholbach/harvest/918150/+merge/89016
Your team harvest-dev is requested to review the proposed merge of lp:~dholbach/harvest/918150 into lp:harvest.
=== modified file 'harvest/common/opportunity_lists.py'
--- harvest/common/opportunity_lists.py	2010-12-08 08:15:50 +0000
+++ harvest/common/opportunity_lists.py	2012-01-18 12:17:23 +0000
@@ -88,8 +88,16 @@
 
 def pull_lists(data_dir):
     list_dir = settings.LIST_PATH
+    old_bzr_log = os.getenv("BZR_LOG")
+    if not old_bzr_log:
+        bzr_log = os.path.join(settings.DATA_PATH, ".bzr.log")
+    else:
+        bzr_log = old_bzr_log_dir
+    os.putenv("BZR_LOG", bzr_log)
     if not os.path.exists(list_dir):
         os.system("cd %s; bzr checkout %s lists -q" % (data_dir, LIST_BRANCH_URL))
     else:
         os.system("cd %s; bzr update -q" % list_dir)
+    if old_bzr_log:
+        os.putenv("BZR_LOG", old_bzr_log)
     return list_dir