Git development
 help / color / mirror / Atom feed
* [PATCH] git-p4import.py: handle paths with symlinks
@ 2007-06-08 22:33 Kevin Green
  0 siblings, 0 replies; only message in thread
From: Kevin Green @ 2007-06-08 22:33 UTC (permalink / raw)
  To: git

Need to expand symlinks when checking if the p4 client is misconfigured
for the local git dir.

Signed-off-by: Kevin Green <Kevin.Green@morganstanley.com>
---
 git-p4import.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-p4import.py b/git-p4import.py
index 0f3d97b..ad15708 100644
--- a/git-p4import.py
+++ b/git-p4import.py
@@ -312,7 +312,7 @@ for o, a in opts:
         p4.authors(a)

 localdir = git.basedir()
-if p4.where()[:len(localdir)] != localdir:
+if os.path.realpath(os.path.dirname(p4.where())) != os.path.realpath(localdir):
     report(1, "**WARNING** Appears p4 client is misconfigured")
     report(1, "   for sync from %s to %s" % (p4.repopath, localdir))
     if ignore_warnings != True:
--
1.5.2.1

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-06-08 22:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-08 22:33 [PATCH] git-p4import.py: handle paths with symlinks Kevin Green

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox