Ubuntu
devscripts package

Merge lp://qastaging/~rockwalrus/ubuntu/karmic/devscripts/bugfixes into lp://qastaging/ubuntu/karmic/devscripts

  1. Karmic (9.10)
  2. bugfixes
  3. Merge into karmic
Proposed by Rockwalrus
Status: Rejected
Rejected by: James Westby
Proposed branch: lp://qastaging/~rockwalrus/ubuntu/karmic/devscripts/bugfixes
Merge into: lp://qastaging/ubuntu/karmic/devscripts
Diff against target: 22 lines
1 file modified
scripts/debcommit.pl (+5/-2)
To merge this branch: bzr merge lp://qastaging/~rockwalrus/ubuntu/karmic/devscripts/bugfixes
Reviewer Review Type Date Requested Status
Benjamin Drung Needs Fixing
Ubuntu branches Pending
Review via email: mp+13233@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Rockwalrus (rockwalrus) wrote :

fixes bug #381456

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

I uploaded the fix to lucid. If you want to have it in karmic too, you have to add a changelog entry and follow the SRU process [1].

[1] https://wiki.ubuntu.com/StableReleaseUpdates

review: Needs Fixing
Revision history for this message
Rockwalrus (rockwalrus) wrote :

It's enough for it to be in lucid. I proposed the fix to be in karmic back before karmic was released, but I don't think it's serious enough for an SRU.

Revision history for this message
James Westby (james-w) wrote :

Ok, rejecting it now, thanks,

James

Unmerged revisions

79. By Rockwalrus

Search for .bzr in addition to .git in parent directory traversal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/debcommit.pl'
2--- scripts/debcommit.pl 2009-08-16 19:15:16 +0000
3+++ scripts/debcommit.pl 2009-10-12 17:05:21 +0000
4@@ -414,13 +414,16 @@
5 }
6 }
7
8- # .git may be in a parent directory, rather than the current
9- # directory, if multiple packages are kept in one git repository.
10+ # .git or .bzr may be in a parent directory, rather than the current
11+ # directory, if multiple packages are kept in one repository.
12 my $dir=getcwd();
13 while ($dir=~s/[^\/]*\/?$// && length $dir) {
14 if (-d "$dir/.git") {
15 return "git";
16 }
17+ if (-d "$dir/.bzr") {
18+ return "bzr";
19+ }
20 }
21
22 die "debcommit: not in a cvs, subversion, baz, bzr, git, hg, svk or darcs working copy\n";

Subscribers

People subscribed via source and target branches

to all changes: