碼上快樂

相關內容    簡體    繁體

（原）patching file 出現 Hunk #1 FAILED at xxx(different line endings).

本文轉載自   查看原文   2022-02-15 09:53   5546    linux

今天在運行自己制作的補丁的時候，對舊代碼打補丁的時候，sudo patch -p1 < xxx.patch的時候，報錯了：

sudo patch -p1 < ffmpeg-fix-bug-too-many-frames-buffered.patch
patching file fftools/ffmpeg.c
Hunk #1 FAILED at 1449 (different line endings).
Hunk #2 FAILED at 1498 (different line endings).
2 out of 2 hunks FAILED -- saving rejects to file fftools/ffmpeg.c.rej　

原因：

網上搜索了一圈，大概原因可能是因為項目有文件有拷貝到windows平台下過，根據自己的情況，確實之前有過這種操作，所以嘗試了一下下面的解決方式，順利解決。

解決方式：

安裝dos2unix工具：sudo apt install -y dos2unix

然后對ffmpeg.c和補丁文件都進行了格式轉碼：

sudo dos2unix fftools/ffmpeg.c
sudo dos2unix ffmpeg-fix-bug-too-many-frames-buffered.patch
sudo patch -p1 < ffmpeg-fix-bug-too-many-frames-buffered.patch　　


免責聲明！

本站轉載的文章為個人學習借鑒使用，本站對版權不負任何法律責任。如果侵犯了您的隱私權益，請聯系本站郵箱yoyou2525@163.com刪除。



猜您在找 Fix patch error "Hunk #* FAILED at * (different line endings)" ", line 1 pip install xxx”"> 關於python中出現“ File " ", line 1 pip install xxx” [Git add . ] 遇到The file will have its original line endings in your working directory 解決辦法 git提交時候報錯：The file will have its original line endings in your working directory. git 提交報錯 : The file will have its original line endings in your working directory. Git提交時提示‘The file will have its original line endings in your working directory’ There are inconsistent line endings in the 'xxx' script. Some are Mac OS X (UNIX) and some are Windows.問題解決 使用python pip安裝工具組件包：出現 requests File “ ",line 1 pip install xxx ^ SyntaxError:invalid syntax ",line 1 pip install XXX的問題"> python-如何解決python執行pip install 命令的時候出現 File" ",line 1 pip install XXX的問題 [git] -- warning: LF will be replaced by CRLF in app/app.iml. The file will have its original line endings in your working directory.
 
粵ICP備18138465號   © 2018-2025 CODEPRJ.COM