Fixed a bug were the err message does not show because git-fast-impor…

…t exits with an exception: fatal: Unsupported command: die-now

git-p4.py

@@ -3253,17 +3253,19 @@ def streamP4FilesCb(self, marshalled):
  if self.stream_have_file_info:
  if "depotFile" in self.stream_file:
  f = self.stream_file["depotFile"]
- # force a failure in fast-import, else an empty
- # commit will be made
- self.gitStream.write("\n")
- self.gitStream.write("die-now\n")
- self.gitStream.close()
- # ignore errors, but make sure it exits first
- self.importProcess.wait()
- if f:
- die("Error from p4 print for %s: %s" % (f, err))
- else:
- die("Error from p4 print: %s" % err)
+ try:
+ # force a failure in fast-import, else an empty
+ # commit will be made
+ self.gitStream.write("\n")
+ self.gitStream.write("die-now\n")
+ self.gitStream.close()
+ # ignore errors, but make sure it exits first
+ self.importProcess.wait()
+ finally:
+ if f:
+ die("Error from p4 print for %s: %s" % (f, err))
+ else:
+ die("Error from p4 print: %s" % err)
 
  if 'depotFile' in marshalled and self.stream_have_file_info:
  # start of a new file - output the old one first