bugQuilt - Bugs: bug #50862, quilt 0.65 produces a patch whose...

 
 

bug #50862: quilt 0.65 produces a patch whose header is incorrect if there are spaces in the path

Submitted by:  None
Submitted on:  Sun 23 Apr 2017 06:14:04 PM UTC  
 
Category: NoneSeverity: 3 - Normal
Item Group: NoneStatus: Fixed
Privacy: PublicAssigned to: Jean Delvare <khali>
Open/Closed: Closed

Add a New Comment(Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Tue 02 May 2017 01:08:24 PM UTC, comment #3:

Fix committed:

diff/refresh: Add missing quotes in basename call

http://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=bc37b6f89faf2062ed25371a90c4ceb064cd6a8f

Jean Delvare <khali>
Project AdministratorIn charge of this item.
Wed 26 Apr 2017 02:14:07 PM UTC, comment #2:

Thanks Jean. That patch resolves the issue for me.

Nate Graham <pointedstick>
Wed 26 Apr 2017 12:03:03 PM UTC, comment #1:

Good catch. This is caused by missing quotes around the directory name in function diff_file. I will attach a patch that fixes is for me, please test and report. I have also fixed another occurrence of the same that could cause a similar problem.

Jean Delvare <khali>
Project AdministratorIn charge of this item.
Sun 23 Apr 2017 06:14:04 PM UTC, original submission:

Distro: openSUSE Tumbleweed
quilt version: 0.65

Steps to reproduce:
1. mkdir ~/folder\ with\ spaces\ in\ it
2 cd ~/folder\ with\ spaces\ in\ it
3. [check out come sources in ~/folder\ with\ spaces\ in\ it and use quilt to make a patch. The specific steps for me were as follows:]
3a. osc checkout home:pointedstick:branches:Base:System sysconfig
3b. cd home\:pointedstick\:branches\:Base\:System/sysconfig/
3c. quilt setup sysconfig.spec
3d. cd sysconfig-0.84.1
3e. quilt new nobeep.patch
3f. quilt edit config/hardware/50-blacklist.conf [make some edits]
3g. quilt header -e [give it a description]
4. quilt refresh
5. head -n 5 patches/<patchname>.patch (here patches/nobeep.patch)

Expected results:
head -n 2 patches/nobeep.patch
Turn off system beeps in GTK programs (bsc#1030936)
Index: sysconfig-0.84.1/config/hardware/50-blacklist.conf

Actual results:
head -n 2 patches/nobeep.patch
Turn off system beeps in GTK programs (bsc#1030936)
Index: folder/config/hardware/50-blacklist.conf

Oops. See that the folder listed in the index is wrong? It should start with "sysconfig-0.84.1" not "folder" (the first word in the parent directory that has spaces in it).

Anonymous

 

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

Attach File(s):
   
   
Comment:
   

Attached Files
file #40511:  quilt-fix-50862.patch added by khali (824B - text/x-patch - [PATCH] Add missing quotes in basename call)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by pointedstick (Posted a comment)
  • -unavailable- added by khali (Posted a comment)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 6 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Tue 02 May 2017 01:08:24 PM UTCkhaliStatusNeed Info=>Fixed
      Open/ClosedOpen=>Closed
    Wed 26 Apr 2017 06:45:46 PM UTCkhaliSummaryquilt 0.65 produces a patch whose header is incorrect if there are speces in the path=>quilt 0.65 produces a patch whose header is incorrect if there are spaces in the path
    Wed 26 Apr 2017 12:04:22 PM UTCkhaliAttached File-=>Added quilt-fix-50862.patch, #40511
    Wed 26 Apr 2017 12:03:03 PM UTCkhaliStatusNone=>Need Info
      Assigned toNone=>khali

    Back to the top


    Powered by Savane 3.1-cleanup1