[Pkg-bazaar-commits] ./bzr-builddeb/trunk r352: Use the tree with DebBuildConfig so mergeWithUpstream gets picked up properly.

[James Westby]

------------------------------------------------------------
revno: 352
author: Jelmer Vernooij <jelmer at samba.org>
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Wed 2009-07-15 19:39:12 +0100
message:
  Use the tree with DebBuildConfig so mergeWithUpstream gets picked up properly.
  
  Thanks Jelmer.
modified:
  cmds.py
-------------- next part --------------
=== modified file 'cmds.py'
--- a/cmds.py	2009-07-15 18:36:36 +0000
+++ b/cmds.py	2009-07-15 18:39:12 +0000
@@ -133,7 +133,7 @@
     if tree.path2id(default_conf):
         config_files.append((tree.get_file(tree.path2id(default_conf)), False,
                     "default.conf"))
-    config = DebBuildConfig(config_files)
+    config = DebBuildConfig(config_files, tree=tree)
     config.set_user_config(user_config)
     return config