[meld] Fix regression in bzr status for exec bit changes

[Kai Willadsen <kaiw src gnome org>]

commit c8f30737408b951679f225fbfe248973830808cf
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Aug 30 07:41:32 2012 +1000

    Fix regression in bzr status for exec bit changes
    
    This patch fixes a regression from commit 139b2dd0 which added
    validation of bzr status lines, but unintentionally required a space
    after the '*' which denotes an exec bit change.

 meld/vc/bzr.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index fbc831b..ac9b6e1 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -55,7 +55,8 @@ class Vc(_vc.CachedVc):
         "M": _vc.STATE_MODIFIED, # File modified
     }
     
-    valid_status_re = r'[%s][%s]\*?\s+' % (''.join(state_1_map.keys()), ''.join(state_2_map.keys()))
+    valid_status_re = r'[%s][%s][\*\s]\s*' % (''.join(state_1_map.keys()),
+                                              ''.join(state_2_map.keys()))
 
     def commit_command(self, message):
         return [self.CMD] + self.CMDARGS + ["commit", "-m", message]