Merge "Fix _ReferenceGitDir symlinking"

Merge "Emit project info in case of sync exception."
Emit project info in case of sync exception.
2025-06-26 20:17:52 +00:00 · 2015-07-31 18:01:32 +00:00 · 2015-07-31 17:06:23 +00:00 · 2015-07-31 14:03:50 +00:00 · 2015-07-30 21:29:53 -07:00
2 changed files with 5 additions and 2 deletions
--- a/project.py
+++ b/project.py
@ -2347,10 +2347,11 @@ class Project(object):
    if copy_all:
      to_copy = os.listdir(gitdir)

+    dotgit = os.path.realpath(dotgit)
    for name in set(to_copy).union(to_symlink):
      try:
        src = os.path.realpath(os.path.join(gitdir, name))
-        dst = os.path.realpath(os.path.join(dotgit, name))
+        dst = os.path.join(dotgit, name)

        if os.path.lexists(dst):
          continue
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@ -314,7 +314,9 @@ later is required to fix a server side protocol bug.
        pm.update()
      except _FetchError:
        err_event.set()
-      except:
+      except Exception as e:
+        print('error: Cannot fetch %s (%s: %s)' \
+            % (project.name, type(e).__name__, str(e)), file=sys.stderr)
        err_event.set()
        raise
    finally:
Author	SHA1	Message	Date
Dan Willemsen	163fdbf2fd	Merge "Fix _ReferenceGitDir symlinking"	2015-07-31 18:01:32 +00:00
Conley Owens	555be54790	Merge "Emit project info in case of sync exception."	2015-07-31 17:06:23 +00:00
Dan Sandler	c5cd433daf	Emit project info in case of sync exception. Previously repo would only print the failing project path if Sync_NetworkHalf returned false/empty, but if it threw an exception the print() was never called. Change-Id: I58c41de43930df5e34b21561c205e062a72e290f	2015-07-31 14:03:50 +00:00
Dan Willemsen	2a3e15217a	Fix _ReferenceGitDir symlinking This fixes these errors: ... File ".repo/repo/project.py", line 2371, in _ReferenceGitDir os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst) OSError: [Errno 17] File exists Which was happening for checkouts that were created before v1.12.8, when project-objects was created. Nothing had yet been forcing these checkouts to use project-objects, until the recent verification changes. In this OSError case, we already created the symlink, so src == dst, and the directory did not exist. This caused us to run os.makedirs the os.symlink on the same file. dst really should be the file in gitdir, not the target of that symlink if it exists. So just use realpath for the dotgit portion of the path. Change-Id: Iff5396a2093de91029c42cf38aa57131fd22981c	2015-07-30 21:29:53 -07:00