bugQuilt - Bugs: bug #62838, Quilt fail to apply patch when the...

 
 

bug #62838: Quilt fail to apply patch when the patch file had been dos2unix-ed

Submitter:  None
Submitted:  Fri 29 Jul 2022 06:32:57 PM UTC
 
Category:  None Severity:  3 - Normal
Item Group:  None Status:  None
Privacy:  Public Assigned to:  None
Open/Closed:  Open
* Mandatory Fields

Add a New Comment (Rich Markup)
   

Comment Type & Canned Response:
       No canned response available

 

Fri 29 Jul 2022 06:32:57 PM UTC, original submission:  

I'm using quilt to apply patches to third party debian packages. I had a patch file that was working, but when it was checked into my github repo, the carriage returns line terminators were turned into line feeds. When the patch was re-applied to the same original source, it failed with the message "Reversed (or previously applied) patch detected!", which I didn't find very informative. Visually comparing the patch against the source being patched didn't flag anything for me, since the differences were in the invisible whitespace.

In this particular case, the patch was to actually remove a file that contained four lines of text. The correct file looks like this:

--- a/poetry-core-1.0.8/poetry/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from pkgutil import extend_path^M
-^M
-^M
-__path__ = extend_path(_path_, _name_)^M

Ideally, I'd hope that the EOL type would not affect the application of a patch, or at least cause quilt to fall back to fuzzy matching and still succeed.

Anonymous

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

Only logged-in users can vote.

 

 

 

 

No changes have been made to this item

Back to the top


Powered by Savane 3.9