Mercurial > trustbridge
comparison ui/installwrapper.cpp @ 1060:317ee9dc4684
(issue46) Make debug output optional in cinst and mozilla and propagate its setting.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 09 Sep 2014 18:49:02 +0200 |
| parents | db7e7156c824 |
| children | a12e6172d82c |
comparison
equal
deleted
inserted
replaced
| 1059:f638eb1f3b0f | 1060:317ee9dc4684 |
|---|---|
| 92 | 92 |
| 93 /* Windows needs each parameter packed in " */ | 93 /* Windows needs each parameter packed in " */ |
| 94 QString parameters = "\"list=" + mCertListFile + | 94 QString parameters = "\"list=" + mCertListFile + |
| 95 "\" \"choices=" + choicesFile.fileName() + "\""; | 95 "\" \"choices=" + choicesFile.fileName() + "\""; |
| 96 | 96 |
| 97 if (g_debug) { | |
| 98 parameters += " --debug"; | |
| 99 } | |
| 100 | |
| 97 shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOW); | 101 shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOW); |
| 98 shExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; | 102 shExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; |
| 99 if (!is_system_install()) { | 103 if (!is_system_install()) { |
| 100 shExecInfo.lpVerb = L"open"; | 104 shExecInfo.lpVerb = L"open"; |
| 101 } else { | 105 } else { |
| 152 QProcess installerProcess; | 156 QProcess installerProcess; |
| 153 QStringList parameters; | 157 QStringList parameters; |
| 154 | 158 |
| 155 choicesFile.setAutoRemove(false); | 159 choicesFile.setAutoRemove(false); |
| 156 parameters << "list=" + mCertListFile << "choices=" + choicesFile.fileName(); | 160 parameters << "list=" + mCertListFile << "choices=" + choicesFile.fileName(); |
| 161 | |
| 162 if (g_debug) { | |
| 163 parameters << "--debug"; | |
| 164 } | |
| 157 | 165 |
| 158 bool sudo_started = false; | 166 bool sudo_started = false; |
| 159 bool use_sudo = is_admin() && is_system_install(); | 167 bool use_sudo = is_admin() && is_system_install(); |
| 160 if (use_sudo) { | 168 if (use_sudo) { |
| 161 QStringList sudoPrograms; | 169 QStringList sudoPrograms; |