patch: empty files in files list, add missing "-p" to mkdir

Bug #110613 reported by John Eckersberg
4
Affects Status Importance Assigned to Milestone
svn-buildpackage (Ubuntu)
Fix Released
Medium
Unassigned

Bug Description

Binary package hint: svn-buildpackage

--- svn-buildpackage.orig 2007-04-27 13:53:18.000000000 -0400
+++ svn-buildpackage 2007-04-27 13:53:18.000000000 -0400
@@ -359,6 +359,7 @@
              print STDERR "DIR: $_\n" if $opt_verbose;
           }
           else {
+ next if /^\s*$/;
              push(@files,$_);
              print STDERR "FILE: $_\n" if $opt_verbose;
           }
@@ -419,7 +420,7 @@
    else {
       mkdir $bdir;
       # stupid autodevtools are confused but... why?
- if(system("mkdir", map { "$bdir/$_" } sort(@dirs)) + system ("cp", "--parents", "-laf", @files, $bdir) )
+ if(system("mkdir", "-p", map { "$bdir/$_" } sort(@dirs)) + system ("cp", "--parents", "-laf", @files, $bdir) )
       #open(tpipe, "| tar c --no-recursion | tar --atime-preserve -x -f- -C $bdir");
       #for(@dirs) {print tpipe "$_\n"}
       #close(tpipe);

Without the first chunk the files list always contains "" as the first element, causing cp to always fail at line 423. Also the "-p" needs added at line 423. Since the cp succeeds, svn-buildpackage will not always use svn --export for creation of the build-area. The major implication for me in this situation is that svn:externals works when using the cp method, but svn exporting does not place the externals in the build area.

Tags: patch
Revision history for this message
John Eckersberg (johnny1) wrote :

Hm, adding the patch as an actual patch attachment so it doesn't get butchered by formatting :)

Morten Kjeldgaard (mok0)
Changed in svn-buildpackage:
assignee: nobody → mok0
status: New → In Progress
Revision history for this message
Morten Kjeldgaard (mok0) wrote :

The patch can not be applied to the current versions of svn-buildpackage. It seems the "mkdir -p" part has already been dealt with upstream.

The "next if /^\s*$/" part of the patch is not, and seems reasonable.

Changed in svn-buildpackage:
assignee: mok0 → nobody
status: In Progress → Confirmed
Revision history for this message
Morten Kjeldgaard (mok0) wrote :

I'd like someone else to verify that this patch is ok. Thanks!

Revision history for this message
Daniel Hahler (blueyed) wrote :

Morten, your debdiff contains the file 110613.patch itself.
I've not looked closer at it now.. can you provide a testcase for this?

Changed in svn-buildpackage:
importance: Undecided → Medium
Revision history for this message
Morten Kjeldgaard (mok0) wrote :

Arrgh! Why does that always happen to me? Anyway, here's another debdiff without my droppings.

Revision history for this message
Daniel Hahler (blueyed) wrote :

Subscribed motu-release.
Can you provide a testcase (and/or a Debian bug report)?

Changed in svn-buildpackage:
status: Confirmed → New
Revision history for this message
StefanPotyra (sistpoty) wrote :

ACK, please go ahead with uploading.

Changed in svn-buildpackage:
status: New → Confirmed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package svn-buildpackage - 0.6.23ubuntu1

---------------
svn-buildpackage (0.6.23ubuntu1) hardy; urgency=low

  * files list always contain "" as the first element (LP: #110613)
  * debian/control: maintainer munge.

 -- Morten Kjeldgaard <email address hidden> Wed, 09 Apr 2008 15:49:26 +0200

Changed in svn-buildpackage:
status: Confirmed → Fix Released
Revision history for this message
jhr (hauke.rahm) wrote :

Has there been any testcase that's not listed here?
1. I can not see the file list always contain "" as the first element. Actually I've never seen that yet.
2. svn export does consider svn:externals, doesn't it?

I'd appreciate any hint to a textcase showing that issue.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.