opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Fix rendering of block in documentation of init program
  Cleanups in gen_licenses.py
  Init: Accept -b as an alias of --batch
  Improve documentation of init program
  AccountManager: Include identity key in exception messages
  Improve formatting in gitweb documentation
  Set version to 2.13-rc1

Change-Id: I7eb67b29ea1f6ab31f2357dbd53898048ea4a07c
This commit is contained in:
David Pursehouse
2016-09-16 10:30:02 +02:00
parent b25ccde0d6 c40eb57da9
commit e57852ddac
4 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
View File

@@ -461,7 +461,8 @@ public class AccountManager {
AccountExternalId extId = getAccountExternalId(db, key);
if (extId != null) {
if (!extId.getAccountId().equals(from)) {
throw new AccountException("Identity in use by another account");
throw new AccountException(
"Identity '" + key.get() + "' in use by another account");
}
db.accountExternalIds().delete(Collections.singleton(extId));
@@ -477,7 +478,7 @@ public class AccountManager {
}
} else {
throw new AccountException("Identity not found");
throw new AccountException("Identity '" + key.get() + "' not found");
}
return new AuthResult(from, key, false);