從修補程序腳本中刪除行

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

我看不到任何人對這個問題感興趣，但我想我反正發佈了答案。

如果您在任何文本編輯器中打開該修補程序，並使用diff命令查找__PATCHFILE_FOLLOWS__這是合併文件的位置。在化妝的情況下它是'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名

。