从补丁脚本中删除行

Question

当我运行一个补丁时，它在其中一个文件上失败了。我想从patch.x.x.x.sh 中删除相应的行，以便修补除此文件之外的所有其他内容。

希望有人能解释一下过程。

例如，我尝试应用补丁 SUPEE-10336 并得到错误：

[http]$ bash PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh
Checking if patch can be applied/reverted successfully...
ERROR: Patch can't be applied/reverted successfully.

patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
patching file app/locale/en_US/Mage_Usa.csv
Hunk #1 FAILED at 99.
1 out of 1 hunk FAILED -- saving rejects to file app/locale/en_US/Mage_Usa.csv.rej

我想编辑PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh，所以我从补丁中删除了负责该文件的行。

Answer 1

我看不到任何人对这个问题感兴趣，但我想我还是发布了答案。

如果您在任何文本编辑器中打开补丁，并找到__PATCHFILE_FOLLOWS__ 部分，使用diff 命令合并文件。在制作情况下，是“Mage_Usa.csv”文件导致了问题，所以我找到了负责该文件的补丁部分：

diff --git app/locale/en_US/Mage_Usa.csv app/locale/en_US/Mage_Usa.csv
index 072170d..5e8f844 100644
--- app/locale/en_US/Mage_Usa.csv
+++ app/locale/en_US/Mage_Usa.csv
@@ -99,7 +99,7 @@
 "First-Class Mail Large Envelope","First-Class Mail Large Envelope"
 "First-Class Mail Large Postcards","First-Class Mail Large Postcards"
 "First-Class Mail Letter","First-Class Mail Letter"
-"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Package Service - Retail","First-Class Package Service - Retail"
 "First-Class Mail Postcards","First-Class Mail Postcards"
 "First-Class Package International Service","First-Class Package International Service"
 "First-Class Package Service","First-Class Package Service"

我已经删除了补丁的整个部分并重新运行它是SSH。

这次：

[http]$ bash PATCH_SUPEE-10336_CE_1.9.2.4_v1.sh
Checking if patch can be applied/reverted successfully...
Patch was applied/reverted successfully.

我已经手动更改了文件 Mage_Usa.csv 中的 USPS 名称（我删除的补丁部分）。