Re: git-p4: t9819 failing
- From
Lars Schneider <larsxschneider@gmail.com>
- Date
- Sep 23, 2015, 12:28 UTC
- Message-ID
- <F37BA8D8-6845-4C47-BBE2-3313685FD16F@gmail.com>
- In-Reply-To
- <CAE5ih78x+jnW3+4d5q5dJidt4LXWV=hMgJTEfsC2dUBLout1Aw@mail.gmail.com>
On 23 Sep 2015, at 13:11, Luke Diamand <luke@diamand.org> wrote:
Show 45 quoted lines
> On 23 September 2015 at 11:27, Lars Schneider <larsxschneider@gmail.com> wrote: >> >> On 23 Sep 2015, at 11:27, Luke Diamand <luke@diamand.org> wrote: >> >>> Lars, >>> >>> I just noticed that your change "git-p4: honor core.ignorecase when >>> using P4 client specs" seems to break t9819. >>> >>> I suspect that the problem is just that t9819 needs to be updated to >>> reflect your change - do you have any thoughts on that? >>> >>> Thanks! >>> Luke >> >> What OS and what commit do you use for testing? Here is what I got on my machine: >> >> Ubuntu, next (c07a1e8) -> OK >> Ubuntu, maint (ee6ad5f) -> OK >> >> OS X, next (c07a1e8) -> broken >> OS X, maint (ee6ad5f) -> broken > > The next branch is good: > c07a1e8 Merge branch 'bb/remote-get-url' into next > > The pu branch isn't: > f44e3df Merge branch 'jk/notes-dwim-doc' into pu > > This is on Debian. > > Actually I think the problem may be in calcDiskFree(). > > Here's the last bit of the crash dump from git-p4 I get: > > File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf > self.streamP4FilesCb(entry) > File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb > required_bytes = int((4 * int(self.stream_file["fileSize"])) - > calcDiskFree(self.cloneDestination)) > File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree > st = os.statvfs(dirname) > OSError: [Errno 2] No such file or directory: 'lc' > > Luke
Confirmed. What do you think about this fix?
Thank you, Lars
--- git-p4.py | 1 + 1 file changed, 1 insertion(+)
diff --git a/git-p4.py b/git-p4.py index 1d1bb87..66c0a4e 100755 --- a/git-p4.py +++ b/git-p4.py @@ -3478,6 +3478,7 @@ class P4Clone(P4Sync): print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination) + self.cloneDestination = os.path.abspath(self.cloneDestination) if not os.path.exists(self.cloneDestination): os.makedirs(self.cloneDestination) chdir(self.cloneDestination)