opendev/gerrit
Code Issues Proposed changes

Honor the sendmail.smtpUser from gerrit.config on upgrade

Browse Source 
If a review site was already existing when the "init" was run but
sendmail.smtpUser was not defined then "init" would set
sendmail.smtpUser to the username of the user running the init. This
would make gerrit use smtp authentication where, before upgrade, smtp
authentication wasn't used.

Instead of doing that, we now honor the value of sendmail.smtpUser from
gerrit.config even when it is null (not present in gerrit.config) in
order to ensure the same behavior of smtp authentication as before
upgrade.

Change-Id: I1b241484ae1d9b5ded7eaf97dbe5dd5cbe10eaf0
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
This commit is contained in:
Sasa Zivkov
2012-05-23 15:03:01 +02:00
parent e1e5ddd646
commit c291f99f07
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java
View File

@@ -28,12 +28,14 @@ import com.google.inject.Singleton;
class InitSendEmail implements InitStep {
private final ConsoleUI ui;
private final Section sendemail;
private final SitePaths site;
@Inject
InitSendEmail(final ConsoleUI ui, final SitePaths site,
final Section.Factory sections) {
this.ui = ui;
this.sendemail = sections.get("sendemail");
this.site = site;
}
public void run() {
@@ -49,7 +51,9 @@ class InitSendEmail implements InitStep {
true);
String username = null;
if ((enc != null && enc != Encryption.NONE) || !isLocal(hostname)) {
if (site.gerrit_config.exists()) {
username = sendemail.get("smtpUser");
} else if ((enc != null && enc != Encryption.NONE) || !isLocal(hostname)) {
username = username();
}
sendemail.string("SMTP username", "smtpUser", username);