Override manifest file only after it is fully written to disk.

We called "Override()" before closing the file passed in argument.

Change-Id: I15adb99deb14297ef72fcb1b0945eb246f172fb0

subcmds/sync.py

@@ -24,6 +24,7 @@ import time
 import xmlrpclib
 
 from git_command import GIT
+from git_refs import R_HEADS
 from project import HEAD
 from project import Project
 from project import RemoteSpec
@@ -147,6 +148,9 @@ later is required to fix a server side protocol bug.
         if not path:
           continue
         if path not in new_project_paths:
+          """If the path has already been deleted, we don't need to do it
+          """
+          if os.path.exists(self.manifest.topdir + '/' + path):
               project = Project(
                              manifest = self.manifest,
                              name = path,
@@ -157,6 +161,7 @@ later is required to fix a server side protocol bug.
                              relpath = path,
                              revisionExpr = 'HEAD',
                              revisionId = None)
+
               if project.IsDirty():
                 print >>sys.stderr, 'error: Cannot remove project "%s": \
 uncommitted changes are present' % project.relpath
@@ -201,6 +206,8 @@ uncommitted changes are present' % project.relpath
         p = self.manifest.manifestProject
         b = p.GetBranch(p.CurrentBranch)
         branch = b.merge
+        if branch.startswith(R_HEADS):
+          branch = branch[len(R_HEADS):]
 
         env = dict(os.environ)
         if (env.has_key('TARGET_PRODUCT') and
@@ -219,13 +226,13 @@ uncommitted changes are present' % project.relpath
             f = open(manifest_path, 'w')
             try:
               f.write(manifest_str)
-              self.manifest.Override(manifest_name)
             finally:
               f.close()
           except IOError:
             print >>sys.stderr, 'error: cannot write manifest to %s' % \
                 manifest_path
             sys.exit(1)
+          self.manifest.Override(manifest_name)
         else:
           print >>sys.stderr, 'error: %s' % manifest_str
           sys.exit(1)