[Pkg-bazaar-commits] ./bzr-builddeb/trunk r339: Remove the rename_map stuff, as it won't work currently.

James Westby james.westby at canonical.com
Sat Jul 4 20:49:13 UTC 2009


------------------------------------------------------------
revno: 339
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Mon 2009-06-08 12:56:09 +0100
message:
  Remove the rename_map stuff, as it won't work currently.
  
  The way we import means that there aren't any unversioned files, so
  rename_map won't do anything. We need to change the import logic to do
  this correctly.
modified:
  import_dsc.py
-------------- next part --------------
=== modified file 'import_dsc.py'
--- a/import_dsc.py	2009-06-08 11:32:19 +0000
+++ b/import_dsc.py	2009-06-08 11:56:09 +0000
@@ -47,7 +47,6 @@
                     bzrdir,
                     generate_ids,
                     osutils,
-                    rename_map,
                     urlutils,
                     )
 from bzrlib.config import ConfigObj
@@ -1129,7 +1128,6 @@
                     upstream_tarball)
             uuencoded = standard_b64encode(delta)
             revprops["deb-pristine-delta"] = uuencoded
-        rename_map.RenameMap.guess_renames(self.tree)
         revid = self.upstream_tree.commit("Import upstream version %s" \
                 % (str(version.upstream_version),),
                 revprops=revprops)
@@ -1255,7 +1253,6 @@
             revprops['deb-thanks'] = "\n".join(thanks)
         if bugs:
             revprops['bugs'] = "\n".join(bugs)
-        rename_map.RenameMap.guess_renames(self.tree)
         self._mark_native_config(native)
         self.tree.commit(message, revprops=revprops)
         self.tag_version(version)



More information about the Pkg-bazaar-commits mailing list