summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Replace `confess $!' with `confess "$!"', to actually print errnoIan Jackson2019-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ perl -e 'use Carp; open X, ">/dev/eacces" or die $!' Permission denied at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess $!' at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess "$!"' Permission denied at -e line 1. $ confess will get references to its arguments in @_. Its documentation says it saves/restores $!. I conjecture that these interact as we see here: $ perl -e '$!=1; sub x { print ">@_<\n"; } x $!;' >Operation not permitted< $ perl -e '$!=1; sub x { local $!; print ">@_<\n"; } x $!;' >< Quoting "$!" averts the reference (and it will also ensure that we get the string value of $!, in case confess were to do anything in the future which would mess that up). This commit was made like this: perl -i -pe 's/confess \$!/confess "\$!"/g' dgit perl -i -pe 's/confess \$!/confess "\$!"/g' git-debrebase perl -i -pe 's/confess \$!/confess "\$!"/g' Debian/Dgit.pm I have manually reviewed each hunk and it all looks good to me. Closes: #929549 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 8.5~Ian Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 8.4debian/8.4archive/debian/8.4Ian Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-03-01
|
* changelog: Reformat and clarify etc.Ian Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: More from gbp-dchIan Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-*: Fix two broken error messagesIan Jackson2019-03-01
| | | | | | | | If you failed to specify the upstream version, some of the messages would still attempt to report what you specified, causing a crash. Closes: #922462 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: resolve_upstream_version: Return $used tooIan Jackson2019-03-01
| | | | | | | Update both callers but right now they just throw the information away. So no overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not misrecognise some initial packaging as gdr-processableIan Jackson2019-03-01
| | | | | | | | | | | | | | git-debrebase expects a breakwater start commit to not make any changes to upstream files. This means that sometimes dgit would fail to make this check, and expect gdr to be able to make patches; but then gdr would reject the branch. It is still of course possible for dgit to ask gdr to make patches for branches that the user does not *intend* to be handled by gdr, but that is OK so long as gdr will DTRT. Closes: #922446 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: nl: unfuzz the translations againIan Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-03-01
|
* dgit.1: Write the leading dash of an option as '\-'Bjarni Ingi Gislason2019-03-01
| | | | Closes: #921965
* changelog: document translationIan Jackson2019-03-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge branch 'wip.i18n-nl' into masterIan Jackson2019-03-01
|\ | | | | | | | | Conflicts: po/nl.po
| * i18n: nl: updated Dutch po fileFrans Spiesschaert2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: New relative path handling: debugging outputIan Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: changes on master so farIan Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix another tiny typo in an error messageIan Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | i18n: unfuzz some of the Dutch translationsIan Jackson2019-03-01
| | | | | | | | | | | | I can't do these all, but I can do these. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: Document typo fixes.Ian Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: Two hunks of my personal preferenceIan Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: Do not put "" around C<..>Ian Jackson2019-03-01
| | | | | | | | | | | | | | In the default text manpage rendering, C produces a pair of quotes and the result is "".."" which is not desirable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: "branch" may be another kind refIan Jackson2019-03-01
| | | | | | | | | | | | | | | | The thing being referred to here is `branch', not `the branch', since it may not be a branch. Put it in italics to make it clear that what is referred to is the metasyntactic variable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: No "if ... ; consequence".Ian Jackson2019-03-01
| | | | | | | | | | | | | | I think the parts of an if and its consequence may not be separated by a semicolon. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: there is no "the restricted command"Ian Jackson2019-03-01
| | | | | | | | | | | | | | | | | | | | I see "ssh restricted command" as a feature. There is no command provided; alternatively one could argue that the user is to provide a script, which they will configure as the restricted command, in which case "to make writing the ssh restricted command script|implementation" or something, but that seems wordy. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation style: "appropriate configuration" as a mass nounIan Jackson2019-03-01
| | | | | | | | | | | | | | | | This is correct IMO. dput has, of course, multiple configuration files, and one might use a wrapper or something, or perhaps (unisely) dgit command line options. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation: typo suggestions from Paul HardyPaul Hardy2019-03-01
| | | | | | | | Signed-off-by: Paul Hardy <unifoundry@gmail.com>
* | dgit: import-dsc: New test for abs/rel dsc component linksIan Jackson2019-03-01
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: import-dsc: Handle relative symlinks correctlyIan Jackson2019-03-01
| | | | | | | | | | | | | | | | | | The logic here was correct only with bpd = `..'. Closes: #913259 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> squash!! dgit: import-dsc: Handle relative symlinks correctly
* | dgit: cmd_import_dsc: comment on lack of is_orig_file checkIan Jackson2019-01-13
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | i18n: nl.po: Remove a spurious spaceIan Jackson2019-01-13
|/ | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.4~Ian Jackson2019-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 8.3debian/8.3archive/debian/8.3Ian Jackson2019-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: preparing 8.3Ian Jackson2019-01-07
| | | | | | gbp dch and significant manual editing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention manually that we close #917194.Ian Jackson2019-01-06
| | | | | | We'll dedupe the entry when we tidy up after running gbp-dch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-01-06
|
* i18n: Dutch message translationsFrans Spiesschaert2019-01-06
| | | | | | dgit: [INTL:nl] Dutch po file for the dgit package Signed-off-by: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>
* i18n: Unfuzz the dgit-user(7).nl manpageIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7): Fix formatting error in comment about multi-archIan Jackson2019-01-06
| | | | | | These lines should not be indented. That makes them format oddly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit-user_7.nl.poFrans Spiesschaert2019-01-06
| | | | | | | | | dgit: [INTL:nl] Dutch po file for the dgit-user_7 manpage [ file copied into right place and po4a.cfg updated -iwj ] Closes: #918253 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Fix pairwise-pocheckIan Jackson2019-01-06
| | | | | | | | The condition to spot only bare < did not work. Fix it. Tcl does not have look-behind assertions, so use . and a look-ahead assertion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: When reporting no such package, say `source package'Ian Jackson2019-01-06
| | | | | | This may help a bit pending a fuller fix to #844206/#870496. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dotdot_bpd_transfer_origs: Change if to early returnIan Jackson2019-01-06
| | | | | | This drops an indentation level. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test that we can copy an orig from bpdIan Jackson2019-01-06
| | | | | | | Manually move just the .orig from the bpd to `..'. Then check that when we are done they are (links to) the same file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Transfer origs from .. to bpd when fetchingIan Jackson2019-01-06
| | | | | | | | | | | | | | | | | | | | | | | | This is the second half of #904878. When fetching we want to avoid downloading once again origs that are already in `..', but not in bpd. So call the facility we now have for making clones of things from `..' to bpd. `..' might contain various junk. We try to treat it with a bit of suspicion. In particular, when we have a dsc we know exactly which orig files we are looking for. So only try to link those. We don't do this transfer for debian tarballs or diffs, or for origs that would be related according to their filenames, but aren't in the dsc. This maximises the probability that fetch will succeed even if there is garbage in the `..'. (Garbage in the `..' will sometimes unavoidably cause source builds to fail, because when doing a source build we don't know what origs to expect.) Closes: #904878 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Transfer origs from .. to bpd when buildingIan Jackson2019-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | This is apropos of #904878. When building we need to consider anything in .. that would be (accordingg to its filename) a possible orig for the package we are building, since we do not know what origs there are supposed to be, and missing ones generate unhelpful error messages. We `copy' things from .. to bpd, rather than just trying to use them directly from .., because otherwise lots of other things won't work right. For example, we might generate .dsc's in the bpd which expect the files alongside, but without the files. But we don't actually copy any files. We prefer to: * If the thing in .. is a symlink, copy the link text, adjusting it into an absolute link. * If the thing in .. is a file, try to hardlink it, or failing that make a symlink to it. The result is that we never duplicate the file contents, but still, where possible, we prefer to make the thing in bpd stand alone so that if the `copy' in .. is deleted everything is still fine. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide dotdot_bpd_transfer_origs for using origs from ..Ian Jackson2019-01-06
| | | | | | No callers yet so no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Remove foolish use of $b in quilt_fixup_multipatchIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Remove foolish uses of $b in unpack_playtree_linkorigs etc.Ian Jackson2019-01-06
| | | | | | | Evidently I had forgotten that $b is weird in Perl and should not by used for things other than sorting. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: generate_commits_from_dsc: Move up $upstreamvIan Jackson2019-01-06
| | | | | | We will want this in a moment. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 08:52:17 +0000