feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Fix writing .netrc configuration file

Browse Source 
The file is expected in the home directory, but was
written in the current working directory.

Change-Id: I4c91f8d706a26331c6b6c878d38ac3556f3ca9b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2017-03-03 06:49:10 +01:00
committed by Orgad Shaneh
parent 45a84ea6b5
commit 1c36a6b274
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gerrit/authenticationdialog.cpp
View File

@@ -73,7 +73,8 @@ AuthenticationDialog::AuthenticationDialog(GerritServer *server) :
ui->descriptionLabel->setOpenExternalLinks(true); ui->descriptionLabel->setOpenExternalLinks(true);
ui->serverLineEdit->setText(server->host); ui->serverLineEdit->setText(server->host);
ui->userLineEdit->setText(server->user.userName); ui->userLineEdit->setText(server->user.userName);
m_netrcFileName = QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "_netrc" : ".netrc"); m_netrcFileName = QDir::homePath() + '/' +
QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "_netrc" : ".netrc");
readExistingConf(); readExistingConf();
QPushButton *anonymous = ui->buttonBox->addButton(tr("Anonymous"), QDialogButtonBox::AcceptRole); QPushButton *anonymous = ui->buttonBox->addButton(tr("Anonymous"), QDialogButtonBox::AcceptRole);
@@ -98,7 +99,7 @@ AuthenticationDialog::~AuthenticationDialog()
void AuthenticationDialog::readExistingConf() void AuthenticationDialog::readExistingConf()
{ {
QFile netrcFile(QDir::homePath() + '/' + m_netrcFileName); QFile netrcFile(m_netrcFileName);
if (!netrcFile.open(QFile::ReadOnly | QFile::Text)) if (!netrcFile.open(QFile::ReadOnly | QFile::Text))
return; return;