edit-patch.sh looks for edit-patch which make it fail to run a subshell

Bug #953857 reported by Javier López
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
devscripts (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Release of Ubuntu: precise
Package Version: 2.11.4ubuntu1
Expected Results: edit-patch should run a subshell to introduce changes
Actual Results: edit-patch fail with the following message:

$ edit-patch.sh 99-new-fix
Normalizing patch path to 99-new-fix
Normalizing patch name to 99-new-fix.patch
grep: debian/patches/99-new-fix.patch: No such file or directory
head: cannot open `debian/patches/99-new-fix.patch' for reading: No such file or directory
sed: can't read debian/patches/99-new-fix.patch: No such file or directory

This happen because at the line ~193:

    if [ "$(basename $0)" = "edit-patch" ]; then
        edit_patch_$PATCHSYSTEM $PATCHNAME
    elif [ "$(basename $0)" = "add-patch" ]; then
        add_patch_$PATCHSYSTEM $1 $PATCHNAME

Compares against "edit-patch" instead of "edit-patch.sh"

Related branches

Revision history for this message
Benjamin Drung (bdrung) wrote :

This is already fixed in the Debian git repository.

Changed in devscripts (Ubuntu):
status: New → Fix Committed
Revision history for this message
Aditya V (kroq-gar78) wrote :

Has the Debian fix made it into Ubuntu yet? I was asking because if not, shouldn't we have two packages affected: "devscripts (Ubuntu)" and "devscripts (Debian)" and set the Debian one to committed?

Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (3.8 KiB)

This bug was fixed in the package devscripts - 2.11.6ubuntu1

---------------
devscripts (2.11.6ubuntu1) precise; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - Demote Recommends to Suggests:
      + libcrypt-ssleay-perl: only needed for a corner case (uscan on SSL
        download sites), wasn't installed by default in previous releases
        either, and seems quite dead upstream; universe only.
      + debian-keyring: not useful enough in Ubuntu; universe only.
      + equivs: too much of a hack to install by default; universe only.
      + libsoap-lite-perl: only needed for one less common command ("select")
        for bts, which isn't useful for Ubuntu itself, and pulls in a lot of
        other universe Perl libraries; universe only.
    - scripts/debchange.{pl,1}:
      + Adjust --security template for Ubuntu.
      + Add -U/--upstream flag that forces original "just increment
        the end" behaviour; Ubuntu is upstream for some pieces of software.
      + Add --distributor= and DEBCHANGE_DISTRIBUTOR to override lsb_release
        output.
      + Default to "precise" as distribution.
      + Add "ubuntu1" to version string for new versions, with tweaks for
        special cases.
      + Add -R/--rebuild flag for Ubuntu's no-change rebuilds.
      + Don't use the last distribution in debian/changelog when doing
        "dch -r" on Ubuntu. "Just because it was last uploaded to jaunty
        doesn't mean that's the right thing to do now."
    - Add test/debchange.pl, test/Makefile: debchange test suite.
    - Rename XS-Vcs-* to XS-Debian-Vcs-*.

devscripts (2.11.6) unstable; urgency=low

  [ James McCoy ]
  * mk-build-deps: Fix handling of debian/control files. (Closes: #665496)
  * uscan: Fix formatting in man page. Thanks to Samuel Bronson for the
    patch. (Closes: #665325)
  * debsign: Fix quoting in handling of --debs-dir.
    (Closes: #666048, LP: #966867)

  [ Benjamin Drung ]
  * cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
    "transfered", and "addtional". Thanks to A. Costa for the patches.
    (Closes: #655681)
  * debcommit:
    + Subversion 1.7 has only one .svn folder per working copy.
      Thanks to Simon Olofsson for the patch. (Closes: #645106)
    + Support .hg in parent directories.
      Thanks to Simon Olofsson for the patch. (Closes: #652967)

  [ David Prévot ]
  * Typo and stylish fix for dscextract(1). (Closes: #630423)

devscripts (2.11.5) unstable; urgency=low

  [ Adam D. Barratt ]
  * deb-reversion:
    + Re-fix handling of multi-word hooks. (Closes: #660782).
      This was originally fixed in 2.9.14 but accidentally broken again in
      2.9.26.
    + Correctly handle cases where a changelog file was not found, possibly
      because of the use of symlinks. (Closes: #660788)

  [ Jakub Wilk ]
  * deb-reversion: Simplify option parsing, also allowing simpler quoting of
    arguments.

  [ James McCoy ]
  * dd-list: Fix correlation of given package name when it does not match the
    source package name. (Closes: #655854)
  * dcmd: Escape directory name so it doesn't interfere with sed command.
    (Closes: #649227)
  * debsnap: Check whether architect...

Read more...

Changed in devscripts (Ubuntu):
status: Fix Committed → Fix Released
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.