[Pkg-bazaar-commits] ./bzr-builddeb/trunk r348: Don't cause the commit to fail if the changelog file is present but unknown.

[James Westby]

------------------------------------------------------------
revno: 348
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Wed 2009-07-15 18:06:04 +0100
message:
  Don't cause the commit to fail if the changelog file is present but unknown.
modified:
  __init__.py
  debian/changelog
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2009-03-02 22:41:44 +0000
+++ b/__init__.py	2009-07-15 17:06:04 +0000
@@ -63,6 +63,8 @@
     cl_path = "debian/changelog"
     if not commit.work_tree.has_filename(cl_path):
         return start_message
+    if commit.work_tree.path2id(cl_path) is None:
+        return start_message
     if cl_path in commit.exclude:
         return start_message
     if commit.specific_files and cl_path not in commit.specific_files:

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-07-15 12:04:31 +0000
+++ b/debian/changelog	2009-07-15 17:06:04 +0000
@@ -1,3 +1,10 @@
+bzr-builddeb (2.2~ubuntu2) karmic; urgency=low
+
+  * Don't cause the commit to fail if the changelog file is present but
+    unknown.
+
+ -- James Westby <james.westby at ubuntu.com>  Wed, 15 Jul 2009 18:05:38 +0100
+
 bzr-builddeb (2.2~ubuntu1) karmic; urgency=low
 
   [ James Westby ]