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