opendev/gerrit
Code Issues Proposed changes

Merge changes I39b56689,I7b428b06,I893c0fd0,I772cc9b0

Browse Source 
* changes:
  AccountSshKey: Split common getter code to utility method
  AccountSshKey.Id: Add isValid() method
  InitAdminUser: Fix invalid sequence number for SSH key
  Fix migration of SSH keys with invalid sequence numbers (<= 0)
This commit is contained in:
Edwin Kempin
2016-05-06 13:15:21 +00:00
committed by Gerrit Code Review
parent 1cf252cabd 7ef114dc62
commit 08f25501ed
4 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAdminUser.java
View File

@@ -164,6 +164,6 @@ public class InitAdminUser implements InitStep {
"Cannot add public SSH key: %s is not a file", keyFile));
}
String content = new String(Files.readAllBytes(p), UTF_8);
return new AccountSshKey(new AccountSshKey.Id(id, 0), content);
return new AccountSshKey(new AccountSshKey.Id(id, 1), content);
}
}