Commit 803fa5bf authored by Alex Xu's avatar Alex Xu Committed by Elvis Angelaccio
Browse files

remove -l flag to 7z a

7z a -l flag was added in ace27733 "[GSoC] Implement AddTo, Rename,
Copy, Move, Paste Actions and Jobs" without explanation. -l causes p7zip
to follow symlinks when adding files. this is inconsistent with other
ark plugins, unintuitive, and not supported by upstream 7zip. therefore,
remove it.
parent c9740b70
Pipeline #178939 passed with stage
in 1 minute and 32 seconds
......@@ -281,7 +281,6 @@ void Cli7zTest::testAddArgs_data()
<< QString() << false << 5 << QStringLiteral("LZMA2") << 0UL
<< QStringList {
QStringLiteral("a"),
QStringLiteral("-l"),
QStringLiteral("-mx=5"),
QStringLiteral("-m0=LZMA2"),
QStringLiteral("/tmp/foo.7z")
......@@ -292,7 +291,6 @@ void Cli7zTest::testAddArgs_data()
<< QStringLiteral("1234") << false << 5 << QStringLiteral("LZMA2") << 0UL
<< QStringList {
QStringLiteral("a"),
QStringLiteral("-l"),
QStringLiteral("-p1234"),
QStringLiteral("-mx=5"),
QStringLiteral("-m0=LZMA2"),
......@@ -304,7 +302,6 @@ void Cli7zTest::testAddArgs_data()
<< QStringLiteral("1234") << true << 5 << QStringLiteral("LZMA2") << 0UL
<< QStringList {
QStringLiteral("a"),
QStringLiteral("-l"),
QStringLiteral("-p1234"),
QStringLiteral("-mhe=on"),
QStringLiteral("-mx=5"),
......@@ -317,7 +314,6 @@ void Cli7zTest::testAddArgs_data()
<< QString() << false << 5 << QStringLiteral("LZMA2") << 2500UL
<< QStringList {
QStringLiteral("a"),
QStringLiteral("-l"),
QStringLiteral("-mx=5"),
QStringLiteral("-m0=LZMA2"),
QStringLiteral("-v2500k"),
......@@ -329,7 +325,6 @@ void Cli7zTest::testAddArgs_data()
<< QString() << false << 5 << QStringLiteral("BZip2") << 0UL
<< QStringList {
QStringLiteral("a"),
QStringLiteral("-l"),
QStringLiteral("-mx=5"),
QStringLiteral("-m0=BZip2"),
QStringLiteral("/tmp/foo.7z")
......
......@@ -50,8 +50,7 @@ void CliPlugin::setupCliProperties()
m_cliProps->setProperty("captureProgress", false);
m_cliProps->setProperty("addProgram", QStringLiteral("7z"));
m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a"),
QStringLiteral("-l")});
m_cliProps->setProperty("addSwitch", QStringList{QStringLiteral("a")});
m_cliProps->setProperty("deleteProgram", QStringLiteral("7z"));
m_cliProps->setProperty("deleteSwitch", QStringLiteral("d"));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment