equal
deleted
inserted
replaced
347 if not user: |
347 if not user: |
348 try: |
348 try: |
349 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
349 user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
350 except KeyError: |
350 except KeyError: |
351 raise util.Abort(_("Please specify a username.")) |
351 raise util.Abort(_("Please specify a username.")) |
352 self.warn(_("No username found, using '%s' instead\n" % user)) |
352 self.warn(_("No username found, using '%s' instead\n") % user) |
353 return user |
353 return user |
354 |
354 |
355 def shortuser(self, user): |
355 def shortuser(self, user): |
356 """Return a short representation of a user name or email address.""" |
356 """Return a short representation of a user name or email address.""" |
357 if not self.verbose: user = util.shortuser(user) |
357 if not self.verbose: user = util.shortuser(user) |