bugQuilt - Bugs: bug #35244, quilt import breaks on relative...

 
 

bug #35244: quilt import breaks on relative filenames due to cd $basedir

Submitted by:  Matthijs Kooijman <matthijs>
Submitted on:  Thu 05 Jan 2012 09:07:51 AM UTC  
 
Category: NoneSeverity: 2 - Minor
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 31 Jan 2012 03:47:50 PM UTC, comment #5:

Fix committed to the repository:

http://git.savannah.gnu.org/cgit/quilt.git/commit/?id=ff960bbd35c4e3aeef7c197e620375805f5e97a3

Thanks for reporting this bug and testing the fix.

Jean Delvare <khali>
Project AdministratorIn charge of this item.
Mon 30 Jan 2012 02:04:36 PM UTC, comment #4:

Just tried your new patch, seems to work as well.

Matthijs Kooijman <matthijs>
Mon 30 Jan 2012 12:43:19 PM UTC, comment #3:

My first attempt was a little naive and broke other use cases (most notably the import of patches with an absolute file path.) The second variant should be better.

(file #24920)

Jean Delvare <khali>
Project AdministratorIn charge of this item.
Mon 30 Jan 2012 11:23:56 AM UTC, comment #2:

I just tested your patch (on 0.50), and it solves the problem for me.

Thanks!

Matthijs Kooijman <matthijs>
Sat 28 Jan 2012 05:41:41 PM UTC, comment #1:

I can reproduce this. Please try the simple patch attached, it fixes the problem for me.

Jean Delvare <khali>
Project AdministratorIn charge of this item.
Thu 05 Jan 2012 09:07:51 AM UTC, original submission:

When running quilt import, it starts by changing the current directory to the quilt basedir (by including patchfns). This means if you run quilt import from a subdirectory, any relative filenames on the commandline break, with a confusing error (Patch does not exist).

This is easy to reproduce:

matthijs@grubby:/tmp$ mkdir test
matthijs@grubby:/tmp$ cd test
matthijs@grubby:/tmp/test$ quilt new foo
matthijs@grubby:/tmp/test$ touch bar.patch
matthijs@grubby:/tmp/test$ mkdir inner
matthijs@grubby:/tmp/test$ cd inner/
matthijs@grubby:/tmp/test/inner$ quilt import ../bar.patch
Patch ../bar.patch does not exist
matthijs@grubby:/tmp/test/inner$ ls -l ../bar.patch
-rw-r--r-- 1 matthijs matthijs 0 Jan 5 10:04 ../bar.patch

The above used quilt 0.50, but a quick glace at git master shows the problem still exists there.

Matthijs Kooijman <matthijs>

 

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

Attach File(s):
   
   
Comment:
   

Attached Files
file #24920:  fix-relative-import.patch added by khali (2KiB - text/x-patch)
file #24910:  fix-relative-import.patch added by khali (738B - text/x-patch - Candidate fix)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by khali (Updated the item)
  • -unavailable- added by matthijs (Submitted the item)
  •  

    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 8 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Tue 31 Jan 2012 03:47:50 PM UTCkhaliStatusNeed Info=>Fixed
      Open/ClosedOpen=>Closed
    Mon 30 Jan 2012 12:43:19 PM UTCkhaliAttached File-=>Added fix-relative-import.patch, #24920
    Sat 28 Jan 2012 05:41:41 PM UTCkhaliStatusConfirmed=>Need Info
    Sat 28 Jan 2012 05:38:56 PM UTCkhaliAttached File-=>Added fix-relative-import.patch, #24910
    Sat 28 Jan 2012 05:37:57 PM UTCkhaliSeverity3 - Normal=>2 - Minor
      StatusNone=>Confirmed
      Assigned toNone=>khali

    Back to the top


    Powered by Savane 3.1-cleanup1