Merge ~bryce/ubuntu-dev-tools:update-maintainer-recursive into ubuntu-dev-tools:master

Proposed by Bryce Harrington
Status: Merged
Merged at revision: 622f550cc9c21545348b22cb7c6e163aced1ef83
Proposed branch: ~bryce/ubuntu-dev-tools:update-maintainer-recursive
Merge into: ubuntu-dev-tools:master
Diff against target: 34 lines (+15/-1)
1 file modified
update-maintainer (+15/-1)
Reviewer Review Type Date Requested Status
Mattia Rizzolo Needs Fixing
Review via email: mp+386415@code.staging.launchpad.net

Description of the change

Allow running ubuntu-maintainer inside the debian/ directory.

1. Current default behavior works as before:

  ~/pkg/Nginx/merge-v1.18.0-3/nginx-gu$ ls
  CHANGES CHANGES.ru LICENSE README auto/ conf/ configure* contrib/ debian/ html/ man/ src/
  ~/pkg/Nginx/merge-v1.18.0-3/nginx-gu$ update-maintainer
  The Maintainer email is set to an ubuntu.com address. Doing nothing.
$ u-m --help | grep -A2 debian-directory
  -d PATH, --debian-directory=PATH
                        location of the 'debian' directory (default:
                        ./debian).

2. New behavior makes it work in debian/ and subdirs (up to 6 levels):

~/pkg/Nginx/merge-v1.18.0-3/nginx-gu$ cd debian/
~/pkg/Nginx/merge-v1.18.0-3/nginx-gu/debian$ u-m
The Maintainer email is set to an ubuntu.com address. Doing nothing.
~/pkg/Nginx/merge-v1.18.0-3/nginx-gu/debian$ update-maintainer --help | grep -A2 debian-directory
  -d PATH, --debian-directory=PATH
                        location of the 'debian' directory (default:
                        ../debian).

~/pkg/Nginx/merge-v1.18.0-3/nginx-gu/debian/modules/http-subs-filter/test/lib/Test$ update-maintainer
The Maintainer email is set to an ubuntu.com address. Doing nothing.

To post a comment you must log in.
Revision history for this message
Mattia Rizzolo (mapreri) :
review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Thank you for the review mapreri.

That's a good point, as a user might have a ~/debian/ directory for their debian work. I've adjusted the code to include your recommendation.

stirling:~/ubuntu/Dovecot/dovecot-gu$ mkdir ~/debian
stirling:~/ubuntu/Dovecot/dovecot-gu$ update-maintainer
The package targets Debian. Doing nothing.
stirling:~/ubuntu/Dovecot/dovecot-gu$ mv debian/ debian-foo
stirling:~/ubuntu/Dovecot/dovecot-gu$ update-maintainer
No control file found in ./debian.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches