Skip to content
This repository has been archived by the owner on Dec 20, 2018. It is now read-only.

Commit

Permalink
Don't get user list from p4 server with --no-getuserlist
Browse files Browse the repository at this point in the history
When we get an error processing the cached user list but the parameter
--no-getuserlist was specified on the command line, we still should
not get the user list from the p4 server. Instead just quit processing
the rest of the cached list.
  • Loading branch information
ermshiperete committed Nov 8, 2011
1 parent cb3d9b5 commit aff5211
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions git-p4
Expand Up @@ -1569,9 +1569,15 @@ class P4Sync(Command):
entry = line.strip().split("\t")
self.users[entry[0]] = entry[1]
except IOError:
self.getUserMapFromPerforceServer()
if self.verbose:
print "IO Error processing line %s" % line
if self.getUserList:
self.getUserMapFromPerforceServer()
except IndexError:
self.getUserMapFromPerforceServer()
if self.verbose:
print "Index Error processing line %s" % line
if self.getUserList:
self.getUserMapFromPerforceServer()

def getLabels(self):
self.labels = {}
Expand Down

0 comments on commit aff5211

Please sign in to comment.