176337 2007-04-28 10:57 0000 echangelog with SVN is broken 2009-05-01 18:55:33 0000 1 1 1 Unclassified Gentoo Linux Unspecified unspecified All All RESOLVED FIXED InCVS, InSVN P2 major --- 136048 1 grobian@gentoo.org tools-portage@gentoo.org grobian@gentoo.org idl0r@gentoo.org michael@smith-li.com ulm@gentoo.org wolf31o2@wolf31o2.org grobian@gentoo.org 2007-04-28 10:57:21 0000 I'm sorry to say so, but echangelog's svn support seems to be broken: [tefnut:portage/sys-apps/portage] % echangelog "New snapshot, two leap jumps forward" Can't read portage-2.1.23.6370.ebuild to update copyright year --- ChangeLog 2007-04-14 10:49:19 +0200 +++ ChangeLog.new 2007-04-28 12:45:04 +0200 @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Apr 2007; Fabian Groffen <grobian@gentoo.org> + -portage-2.1.23.6370.ebuild, +portage-2.1.25.6450.ebuild: + New snapshot, two leap jumps forward + *portage-2.1.23.6400 (14 Apr 2007) 14 Apr 2007; Fabian Groffen <grobian@gentoo.org> svn: warning: 'ChangeLog' is already under version control [tefnut:portage/sys-apps/portage] % As you can see, there are two issues here: 1) it doesn't add a new version header, and 2) it tries to add ChangeLog Reproducible: Always Steps to Reproduce: 1. emerge =gentoolkit-dev-0.2.6.5 2. use echangelog on an SVN repo 3. Actual Results: crap as described above Expected Results: To work like my own SVN patch. Not as elegant as the one included maybe, but works fine. emergeing =gentoolkit-dev-0.2.6.4 with my own patch applied (http://overlays.gentoo.org/proj/alt/browser/trunk/prefix-overlay/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.6.1-svn-echangelog.patch) I get for the same command (with a reverted ChangeLog) the following output: [tefnut:portage/sys-apps/portage] % echangelog "New snapshot, two leap jumps forward" --- ChangeLog 2007-04-28 12:54:10 +0200 +++ ChangeLog.new 2007-04-28 12:54:24 +0200 @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*portage-2.1.25.6450 (28 Apr 2007) + + 28 Apr 2007; Fabian Groffen <grobian@gentoo.org> + -portage-2.1.23.6370.ebuild, +portage-2.1.25.6450.ebuild: + New snapshot, two leap jumps forward + *portage-2.1.23.6400 (14 Apr 2007) 14 Apr 2007; Fabian Groffen <grobian@gentoo.org> [tefnut:portage/sys-apps/portage] % genstef@gentoo.org 2007-04-28 18:28:24 0000 Created an attachment (id=117567) fixes the second issue I don't understand the first issue enough. Need to debug more. genstef@gentoo.org 2007-04-28 20:24:44 0000 Created an attachment (id=117581) fixes the second issue small bug correction .. fuzzyray@gentoo.org 2007-05-11 05:19:04 0000 $ svn commit -m "Add patch from genstef to fix issues from Bug 176337" Sending echangelog/echangelog Transmitting file data . Committed revision 400. genstef@gentoo.org 2007-05-11 11:00:43 0000 ok, fixes the other issues: $ svn diff . Index: echangelog =================================================================== --- echangelog (Revision 401) +++ echangelog (Arbeitskopie) @@ -410,6 +410,7 @@ # copyright lines on ebuilds that haven't changed. I verified this with an IP # lawyer. for my $e (grep /\.ebuild$/, @files) { + if (-s $e) { my ($etext, $netext); open E, "<$e" or warn("Can't read $e to update copyright year\n"), next; { local $/ = undef; $etext = <E>; } @@ -427,6 +428,7 @@ # Move things around and show the diff system "diff -U 0 $e $e.new"; rename "$e.new", $e or warn("Can't rename $e.new: $!\n"); + } } # Move things around and show the ChangeLog diff @@ -442,7 +444,7 @@ } } elsif ($vcs eq "svn") { if (open F, ".svn/entries") { - system("svn add ChangeLog") unless (scalar grep /^ChangeLog$/, <F>); + system("svn add ChangeLog") unless (scalar grep /ChangeLog/, <F>); } } else { system("$vcs{$vcs}{add} ChangeLog 2>&1 >> /dev/null"); fuzzyray@gentoo.org 2007-05-22 21:36:33 0000 gentoolkit-dev-0.2.6.6 will be in the tree within a couple of hours. I'm waiting for the updated package.mask to propagate before making the commit. fuzzyray@gentoo.org 2007-05-23 01:38:33 0000 Fixed in gentoolkit-0.2.6.6 grobian@gentoo.org 2007-08-10 17:29:43 0000 well, I waited a long time to try this, basically because I have no time to debug this kind of stuff. Anyway, it is STILL broken. [ra:portage/sys-apps/portage] % svn rm -f portage-2.2.00.7521.ebuild D portage-2.2.00.7521.ebuild [ra:portage/sys-apps/portage] % svn add portage-2.2.00.7586.ebuild A portage-2.2.00.7586.ebuild [ra:portage/sys-apps/portage] % echangelog "New snapshot which solves creating double prefixes" --- ChangeLog 2007-08-04 23:43:04.990704552 +0200 +++ ChangeLog.new 2007-08-10 19:21:54.865769375 +0200 @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Aug 2007; Fabian Groffen <grobian@gentoo.org> + -portage-2.2.00.7521.ebuild, +portage-2.2.00.7586.ebuild: + New snapshot which solves creating double prefixes + *portage-2.2.00.7571 (04 Aug 2007) 04 Aug 2007; Fabian Groffen <grobian@gentoo.org> [ra:portage/sys-apps/portage] % emerge -av gentoolkit-dev These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild R ] app-portage/gentoolkit-dev-0.2.6.6 0 kB Total: 1 package (1 reinstall), Size of downloads: 0 kB Would you like to merge these packages? [Yes/No] n Quitting. Again: my own patch worked and always has worked Flawlessly. Masking 0.2.6.6 again here. michael@smith-li.com 2008-02-29 21:33:15 0000 (In reply to comment #7) > well, I waited a long time to try this, basically because I have no time to > debug this kind of stuff. Anyway, it is STILL broken. <snip> > Again: my own patch worked and always has worked Flawlessly. Masking 0.2.6.6 > again here. I don't actually see what's wrong with the output demonstrated in comment #7. grobian@gentoo.org 2008-02-29 22:05:02 0000 it doesn't add a new entry for the new portage version added. fuzzyray@gentoo.org 2008-11-07 22:20:57 0000 Created an attachment (id=171052) Patch to fix echangelog to properly identify added ebuilds $ svn commit -m "Fix echangelog to properly identify added ebuilds. (Bug #176337)" Sending echangelog/echangelog Transmitting file data . Committed revision 518. Please test! idl0r@gentoo.org 2008-11-07 23:30:18 0000 (In reply to comment #10) > Created an attachment (id=171052) [edit] > Patch to fix echangelog to properly identify added ebuilds > > $ svn commit -m "Fix echangelog to properly identify added ebuilds. (Bug > #176337)" > Sending echangelog/echangelog > Transmitting file data . > Committed revision 518. > > Please test! > _if_ that does not work you can also try my dirty patch from https://bugs.gentoo.org/attachment.cgi?id=170847 (bug 182834) grobian@gentoo.org 2008-12-28 11:54:28 0000 is this available in an ebuild? idl0r@gentoo.org 2008-12-28 12:17:34 0000 Created an attachment (id=176593) svn-git-workaround.patch (In reply to comment #12) > is this available in an ebuild? > portage-2.2_rc19 should have a patched version and maybe 2.1.6.3. otherwise see gentoo cvs. but an additional patch/workaround would be useful then (see attachment) idl0r@gentoo.org 2008-12-28 12:21:37 0000 damn, ignore my comment about portage... i need more coffee. its in gentoolkit-dev of course :/ grobian@gentoo.org 2008-12-28 12:56:26 0000 is it available in? app-portage/gentoolkit-dev-0.2.6.8 If yes, I will test in the near future. idl0r@gentoo.org 2008-12-28 13:40:55 0000 (In reply to comment #15) > is it available in? > app-portage/gentoolkit-dev-0.2.6.8 > nope :/ > If yes, I will test in the near future. > fuzzyray@gentoo.org 2008-12-31 15:40:39 0000 It will be in gentoolkit-dev-0.2.6.9 which I have package masked for testing. fuzzyray@gentoo.org 2009-01-09 04:50:25 0000 gentoolkit-0.2.6.9 has been in the tree for about a week. Has anyone been able to test it? fuzzyray@gentoo.org 2009-04-29 20:53:30 0000 gentoolkit-0.2.6.10 has been released. I will close after independent verification that the bug is fixed. grobian@gentoo.org 2009-05-01 18:55:33 0000 I briefly tested echangelog from 0.2.6.10 and it seems to behave. At least the behaviour I originally reported in this bug seems to be fixed, at last. Thanks, bug has been open for long enough now, closing. 117567 2007-04-28 18:28 0000 fixes the second issue patch text/plain LS0tIC91c3IvYmluL2VjaGFuZ2Vsb2cub3JpZwkyMDA3LTA0LTI4IDIwOjA5OjU2LjAwMDAwMDAw MCArMDIwMAorKysgL3Vzci9iaW4vZWNoYW5nZWxvZwkyMDA3LTA0LTI4IDIwOjIyOjM4LjAwMDAw MDAwMCArMDIwMApAQCAtNDYsNyArNDYsNyBAQAogICAgJHZjcyA9ICJjdnMiOwogfSBlbHNpZiAo IC1kICcuc3ZuJyApIHsKICAgICAkdmNzID0gInN2biI7Ci19IGVsc2lmICggb3BlbiBHSVQsICJn aXQgcmV2LXBhcnNlIC0tZ2l0LWRpciB8IiApIHsKK30gZWxzaWYgKCAtZCAnL3Vzci9iaW4vZ2l0 JyBhbmQgb3BlbiBHSVQsICJnaXQgcmV2LXBhcnNlIC0tZ2l0LWRpciB8IiApIHsKICAgICAkdmNz ID0gImdpdCI7CiAgICAgY2xvc2UgR0lUOwogfSBlbHNlIHsKQEAgLTMwNSw3ICszMDUsNyBAQAog ICAgIHByaW50IFNUREVSUiAiKipcbiI7CiAgICAgcHJpbnQgU1RERVJSICIqKiBOT1RFOiBObyBu b24tdHJpdmlhbCBjaGFuZ2VkIGZpbGVzIGZvdW5kLiAgTm9ybWFsbHkgZWNoYW5nZWxvZ1xuIjsK ICAgICBwcmludCBTVERFUlIgIioqIHNob3VsZCBiZSBydW4gYWZ0ZXIgYWxsIGFmZmVjdGVkIGZp bGVzIGhhdmUgYmVlbiBhZGRlZCBhbmQvb3JcbiI7Ci0gICAgcHJpbnQgU1RERVJSICIqKiBtb2Rp ZmllZC4gIERpZCB5b3UgZm9yZ2V0IHRvIGN2cyBhZGQ/XG4iOworICAgIHByaW50IFNUREVSUiAi KiogbW9kaWZpZWQuICBEaWQgeW91IGZvcmdldCB0byAkdmNzIGFkZD9cbiI7CiAgICAgcHJpbnQg U1RERVJSICIqKlxuIjsKICAgICBAZmlsZXMgPSBzb3J0IHNvcnRmdW5jIEB0cml2aWFsOwogICAg IEBmaWxlcyA9IHF3L0NoYW5nZUxvZy8gdW5sZXNzIEBmaWxlczsgICMgbGFzdCByZXNvcnQgdG8g cHV0IHNvbWV0aGluZyBpbiB0aGUgbGlzdApAQCAtNDM1LDcgKzQzNSwxNSBAQAogCiAjIE9rYXks IG5vdyB3ZSBoYXZlIGEgc3RhcnRlciBDaGFuZ2VMb2cgdG8gd29yayB3aXRoLgogIyBUaGUgdGV4 dCB3aWxsIGJlIGFkZGVkIGp1c3QgbGlrZSB3aXRoIGFueSBvdGhlciBDaGFuZ2VMb2cgYmVsb3cu ICAKLSMgQWRkIHRoZSBuZXcgY2hhbmdlbG9nIHRvIHZjcywgbWF5YmUgaXQgYWxyZWFkeSBpcyBh ZGRlZCwgYnV0IHdobyBjYXJlcyByaWdodD8KLXN5c3RlbSgiJHZjc3skdmNzfXthZGR9IENoYW5n ZUxvZyAyPiYxID4+IC9kZXYvbnVsbCIpCisjIEFkZCB0aGUgbmV3IENoYW5nZUxvZyB0byB2Y3Mg YmVmb3JlIGNvbnRpbnVpbmcuCitpZiAoJHZjcyBlcSAiY3ZzIikgeworICAgIGlmIChvcGVuIEYs ICJDVlMvRW50cmllcyIpIHsKKyAgICAgICAgc3lzdGVtKCJjdnMgLWYgYWRkIENoYW5nZUxvZyIp IHVubGVzcyAoc2NhbGFyIGdyZXAgL15cL0NoYW5nZUxvZ1wvLywgPEY+KTsKKyAgICB9Cit9IGVs c2lmICgkdmNzIGVxICJzdm4iKSB7CisgICAgaWYgKG9wZW4gRiwgIi5zdm4vZW50cmllcyIpIHsK KyAgICAgICAgc3lzdGVtKCJzdm4gYWRkIENoYW5nZUxvZyIpIHVubGVzcyAoc2NhbGFyIGdyZXAg L15DaGFuZ2VMb2ckLywgPEY+KTsKKyAgICB9Cit9IGVsc2Ugc3lzdGVtKCIkdmNzeyR2Y3N9e2Fk ZH0gQ2hhbmdlTG9nIDI+JjEgPj4gL2Rldi9udWxsIikKIAogIyB2aW06c3c9NCB0cz04IGV4cGFu ZHRhYgo= 117581 2007-04-28 20:24 0000 fixes the second issue patch text/plain LS0tIC91c3IvYmluL2VjaGFuZ2Vsb2cub3JpZwkyMDA3LTA0LTI4IDIwOjA5OjU2LjAwMDAwMDAw MCArMDIwMAorKysgL3Vzci9iaW4vZWNoYW5nZWxvZwkyMDA3LTA0LTI4IDIyOjIzOjE0LjAwMDAw MDAwMCArMDIwMApAQCAtNDYsNyArNDYsNyBAQAogICAgJHZjcyA9ICJjdnMiOwogfSBlbHNpZiAo IC1kICcuc3ZuJyApIHsKICAgICAkdmNzID0gInN2biI7Ci19IGVsc2lmICggb3BlbiBHSVQsICJn aXQgcmV2LXBhcnNlIC0tZ2l0LWRpciB8IiApIHsKK30gZWxzaWYgKCAtZCAnL3Vzci9iaW4vZ2l0 JyBhbmQgb3BlbiBHSVQsICJnaXQgcmV2LXBhcnNlIC0tZ2l0LWRpciB8IiApIHsKICAgICAkdmNz ID0gImdpdCI7CiAgICAgY2xvc2UgR0lUOwogfSBlbHNlIHsKQEAgLTMwNSw3ICszMDUsNyBAQAog ICAgIHByaW50IFNUREVSUiAiKipcbiI7CiAgICAgcHJpbnQgU1RERVJSICIqKiBOT1RFOiBObyBu b24tdHJpdmlhbCBjaGFuZ2VkIGZpbGVzIGZvdW5kLiAgTm9ybWFsbHkgZWNoYW5nZWxvZ1xuIjsK ICAgICBwcmludCBTVERFUlIgIioqIHNob3VsZCBiZSBydW4gYWZ0ZXIgYWxsIGFmZmVjdGVkIGZp bGVzIGhhdmUgYmVlbiBhZGRlZCBhbmQvb3JcbiI7Ci0gICAgcHJpbnQgU1RERVJSICIqKiBtb2Rp ZmllZC4gIERpZCB5b3UgZm9yZ2V0IHRvIGN2cyBhZGQ/XG4iOworICAgIHByaW50IFNUREVSUiAi KiogbW9kaWZpZWQuICBEaWQgeW91IGZvcmdldCB0byAkdmNzIGFkZD9cbiI7CiAgICAgcHJpbnQg U1RERVJSICIqKlxuIjsKICAgICBAZmlsZXMgPSBzb3J0IHNvcnRmdW5jIEB0cml2aWFsOwogICAg IEBmaWxlcyA9IHF3L0NoYW5nZUxvZy8gdW5sZXNzIEBmaWxlczsgICMgbGFzdCByZXNvcnQgdG8g cHV0IHNvbWV0aGluZyBpbiB0aGUgbGlzdApAQCAtNDM1LDcgKzQzNSwxNyBAQAogCiAjIE9rYXks IG5vdyB3ZSBoYXZlIGEgc3RhcnRlciBDaGFuZ2VMb2cgdG8gd29yayB3aXRoLgogIyBUaGUgdGV4 dCB3aWxsIGJlIGFkZGVkIGp1c3QgbGlrZSB3aXRoIGFueSBvdGhlciBDaGFuZ2VMb2cgYmVsb3cu ICAKLSMgQWRkIHRoZSBuZXcgY2hhbmdlbG9nIHRvIHZjcywgbWF5YmUgaXQgYWxyZWFkeSBpcyBh ZGRlZCwgYnV0IHdobyBjYXJlcyByaWdodD8KLXN5c3RlbSgiJHZjc3skdmNzfXthZGR9IENoYW5n ZUxvZyAyPiYxID4+IC9kZXYvbnVsbCIpCisjIEFkZCB0aGUgbmV3IENoYW5nZUxvZyB0byB2Y3Mg YmVmb3JlIGNvbnRpbnVpbmcuCitpZiAoJHZjcyBlcSAiY3ZzIikgeworICAgIGlmIChvcGVuIEYs ICJDVlMvRW50cmllcyIpIHsKKyAgICAgICAgc3lzdGVtKCJjdnMgLWYgYWRkIENoYW5nZUxvZyIp IHVubGVzcyAoc2NhbGFyIGdyZXAgL15cL0NoYW5nZUxvZ1wvLywgPEY+KTsKKyAgICB9Cit9IGVs c2lmICgkdmNzIGVxICJzdm4iKSB7CisgICAgaWYgKG9wZW4gRiwgIi5zdm4vZW50cmllcyIpIHsK KyAgICAgICAgc3lzdGVtKCJzdm4gYWRkIENoYW5nZUxvZyIpIHVubGVzcyAoc2NhbGFyIGdyZXAg L15DaGFuZ2VMb2ckLywgPEY+KTsKKyAgICB9Cit9IGVsc2UgeworICAgIHN5c3RlbSgiJHZjc3sk dmNzfXthZGR9IENoYW5nZUxvZyAyPiYxID4+IC9kZXYvbnVsbCIpOworfQogCiAjIHZpbTpzdz00 IHRzPTggZXhwYW5kdGFiCg== 171052 2008-11-07 22:20 0000 Patch to fix echangelog to properly identify added ebuilds echangelog.176337.patch text/plain SW5kZXg6IGVjaGFuZ2Vsb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZWNoYW5nZWxvZwkocmV2aXNpb24gNTE3 KQorKysgZWNoYW5nZWxvZwkod29ya2luZyBjb3B5KQpAQCAtMzMzLDYgKzMzMywxOCBAQAogfQog Y2xvc2UgQzsKIAorIyBTdWJ2ZXJzaW9uIGRpZmYgZG9lc24ndCBpZGVudGlmeSBuZXcgdmVyc2lv bnMuIFNvIHVzZSB0aGUgc3RhdHVzIGNvbW1hbmQKK2lmICgoJHZjcyBlcSAic3ZuIikgYW5kIChA ZWJ1aWxkcykpIHsKKwlvcGVuIEMsICR2Y3N7JHZjc317c3RhdHVzfS4iIEBlYnVpbGRzIDI+JjEg fCIgb3IgZGllICJDYW4ndCBydW46ICIuJHZjc3skdmNzfXtzdGF0dXN9LiIkIVxuIjsKKwkkXyA9 IDxDPjsKKwl3aGlsZSAoZGVmaW5lZCAkXykgeworCQlpZiAoL15BXHMqKFxzezF9W15cc10qKVwu ZWJ1aWxkLykgeworCQkJcHVzaCBAbmV3X3ZlcnNpb25zLCAkMTsKKwkJfQorCQkkXyA9IDxDPjsK Kwl9Cit9CisKICMgV2hlbiBhIHBhY2thZ2UgbW92ZSBvY2N1cnMsIHRoZSB2ZXJzaW9ucyBhcHBl YXIgdG8gYmUgbmV3IGV2ZW4gdGhvdWdoIHRoZXkgYXJlCiAjIG5vdC4gIFRyaW0gdGhlbSBmcm9t IEBuZXdfdmVyc2lvbnMgaW4gdGhhdCBjYXNlLgogQG5ld192ZXJzaW9ucyA9IGdyZXAgeyAkdGV4 dCAhfiAvXlwqXFEkX1xFXHMvbSB9IEBuZXdfdmVyc2lvbnM7Cg== 176593 2008-12-28 12:17 0000 svn-git-workaround.patch svn-git-workaround.patch text/plain LS0tIGVjaGFuZ2Vsb2ctc3ZuCTIwMDgtMTItMDcgMTA6NTg6MjMuMDAwMDAwMDAwICswMTAwCisr KyBlY2hhbmdlbG9nCTIwMDgtMTItMDcgMTA6NTc6MDYuMDAwMDAwMDAwICswMTAwCkBAIC0yNzcs OCArMjc3LDEwIEBAIHN1YiBzb3J0ZnVuYygkJCkgewogIyBGb3JnZXQgZWJ1aWxkcyB0aGF0IG9u bHkgaGF2ZSBjaGFuZ2VkIGNvcHlyaWdodHMsIHVubGVzcyB0aGF0J3MgYWxsCiAjIHRoZSBjaGFu Z2VkIGZpbGVzIHdlIGhhdmUKIAotQGVidWlsZHMgPSBncmVwIC9cLmVidWlsZCQvLCBAZmlsZXM7 Ci1AZmlsZXMgPSBncmVwICEvXC5lYnVpbGQkLywgQGZpbGVzOworaWYoJHZjcyBlcSAiY3ZzIikg eworICAgIEBlYnVpbGRzID0gZ3JlcCAvXC5lYnVpbGQkLywgQGZpbGVzOworICAgIEBmaWxlcyA9 IGdyZXAgIS9cLmVidWlsZCQvLCBAZmlsZXM7Cit9CiAKIGlmIChAZWJ1aWxkcykgewogICAgIGlm ICgkdmNzIGVxICJnaXQiKSB7Cg==