diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-09-05 12:32:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-09-07 06:55:57 +0000 |
| commit | a0e4a06f5ee398115d6ab2ba5ff8a2dc4107e51e (patch) | |
| tree | 04c8062a785d9801f399b6b147dac7639a04f0b4 | |
| parent | c771928f53cea2691038507bdf9a8826dec0ddb3 (diff) | |
| download | qt-creator-a0e4a06f5ee398115d6ab2ba5ff8a2dc4107e51e.tar.gz | |
RemoteLinux: Remove unnecessary "--" from kill command
Apparently we don't need to prefix negative PIDs with "--" if we
explicitly give a signal number, and busybox complains about it.
Change-Id: I009cf7f2dafb3c38185e3a86146d30e47ea2e676
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxsignaloperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index b59118b4aa..e529b7cdce 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -51,7 +51,7 @@ RemoteLinuxSignalOperation::~RemoteLinuxSignalOperation() static QString signalProcessGroupByPidCommandLine(qint64 pid, int signal) { - return QString::fromLatin1("kill -%1 -- -%2 %2").arg(signal).arg(pid); + return QString::fromLatin1("kill -%1 -%2 %2").arg(signal).arg(pid); } void RemoteLinuxSignalOperation::run(const QString &command) @@ -78,7 +78,7 @@ static QString signalProcessGroupByNameCommandLine(const QString &filePath, int "cd /proc; for pid in `ls -d [0123456789]*`; " "do " "if [ \"`readlink /proc/$pid/exe`\" = \"%1\" ]; then " - " kill -%2 -- -$pid $pid;" + " kill -%2 -$pid $pid;" "fi; " "done").arg(filePath).arg(signal); } |