diff options
author | Niels Weber <niels.2.weber@nokia.com> | 2012-05-22 12:10:24 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-05-24 17:12:18 +0200 |
commit | 4fc262a5bd06ceae38fa33e2a7993937a43fe139 (patch) | |
tree | d12cd6a02c781a5b7f3490f98900613d9ae70f2b /src/libs/installer/adminauthorization_x11.cpp | |
parent | 143d6a9f77f0f42485105103b66302aeff9524dd (diff) |
After failing admin authorization, allow retrying by hand
Change-Id: If05f1c6359c2667e0094721540415b5293856370
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/installer/adminauthorization_x11.cpp')
-rw-r--r-- | src/libs/installer/adminauthorization_x11.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index 468ce6878..14467fecd 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -33,6 +33,7 @@ #include "adminauthorization.h" #include <QtCore/QFile> +#include <QDebug> #include <QtGui/QApplication> #include <QtGui/QInputDialog> @@ -72,8 +73,8 @@ static QString getPassword(QWidget *) if (QApplication::type() == QApplication::GuiClient) { bool ok = false; const QString result = QInputDialog::getText(0, QObject::tr("Authorization required"), - QObject::tr("Enter your password to authorize for sudo:"), - QLineEdit::Password, QString(), &ok); + QObject::tr("Enter your password to authorize for sudo:"), + QLineEdit::Password, QString(), &ok); return ok ? result : QString(); } else { std::cout << QObject::tr("Authorization required").toStdString() << std::endl; @@ -95,6 +96,9 @@ static void printError(QWidget *parent, const QString &value) bool AdminAuthorization::execute(QWidget *parent, const QString &program, const QStringList &arguments) { + const QString fallback = program + QLatin1String(" ") + arguments.join(QLatin1String(" ")); + qDebug() << "Fallback:" << fallback; + // as we cannot pipe the password to su in QProcess, we need to setup a pseudo-terminal for it int masterFD = -1; int slaveFD = -1; |