summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* dgit: Add many pre_* to call no_local_git_cfgIan Jackson2017-07-08
| | | | | | | | | | | | | | For each operation which can meaningfully be run outside a git tree, arrange to call no_local_git_cfg and thus avoid running git config --local There is one slight infelicity: some subcommands (notably archive-api-query) could in theory be run within a git tree and expect that git tree to influence their output. However, this seems unlikely. In fact, I think there are probably only in-tree callers and the in-tree callers do not do this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush: Do argument parsing and chdir in pre_...Ian Jackson2017-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | The only thing in between pre_... and cmd_... os git_slurp_config. The code now in pre_... does the following things, all of these should be done before git_slurp_config: * Sets some global variables affecting debugging and logging output. If git_slurp_config is told to print debugging, it should be affected by these changes. * Rearranges its file descriptors so that stdin/stdout are as the rest of dgit expects, and the protocol is on PI/PO. If git_slurp_config were to use stdin/stdout, it ought to use the "normal" versions, and not access the protocol streams. * Checks and calculates the negotiated protocol version. This is not affected by the config, only by the arguments form the caller and our own idea of the protocol versions we support. * Changes to the appropriate working tree. Doing this before slurping the config arranges to honour the local git config from build host working tree. (It also avoids rpush failing on newer git due to asking for git config --local in the wrong place.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Cope with git restricting ext:: protocols.Ian Jackson2017-07-08
| | | | | | | buster's git rejects ext:: by default. See #XXXX and man git-config |less +/'protocol.*allow' Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Cope if the archive server sends an HTTP redirectIan Jackson2017-07-08
| | | | | | | | | | | | | | | | | | | | | | | We achieve this by passing -L to curl. We also pass an appropriate-seeming --proto-redir, because the curl manual is not entirely reassuring that following redirections with the default configuration is safe. This finally fixes #867185/#867309. What happens there is that curl gets a redirect, along with an HTML error document. curl then exits with status zero, effectively pretending that the error document is the resource which was requested. dgit notices that something is wrong because the file does not have the expected cryptographic checksum. I suspect that there are other download problems which would give a similar effect. Sadly the curl manpage doesn't seem to suggest a way to avoid this. At least, dgit will never carry on in such a situation, since it insists that the file has the right hash. And if it does have the right hash we don't really care how it was obtained. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fix rpush+buildinfo: Transfer buildinfos for signing.Ian Jackson2017-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | buildinfos are supposed to be signed. And, indeed, if they are present, debsign wants to sign them. That means they need to be transferred to the signing end, and back again. We check that the filename is not totally unreasonable, but do not attempt to verify it completely. If there are situations where unwanted or confusing buildinfos are generated, this is the fault of the build process. dgit rpush should, in this respect, do the same as debsign+dput - ie faithfully sign and upload what the build has provided. We do check that the buildinfo doesn't look too much like a .changes, and mentions the same files as the .changes (insofar as they mention files in common). This is a rather nugatory defence against some kinds of bait and switch attacks. This is in some sense an incompatible protocol change: if the build host has a new dgit, and sends buildinfos, an old dgit on the initiator will declare a protocol violation. However, the new protocol elements occur only when needed. in this situation, the only way to get things to work at all with the old dgit at either end would be to strip out the buildinfos, which is obviously undesirable. Closes:#867693. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.11~Ian Jackson2017-02-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.10debian/3.10archive/debian/3.10Ian Jackson2017-02-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Update for docs fixesNicholas D Steeves2017-02-05
| | | | Signed-off-by: Nicholas D Steeves <nsteeves@gmail.com>
* import-maintmangle: New test for changelog Maintainer mangling.Ian Jackson2017-02-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: importing: Better handle commas in changelog maintainer fieldsIan Jackson2017-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some maintainers have written commas in the maintainer field of their changelog entries. Such changelog entries could not be imported. clogp_authline had code to replace multiple maintainers (which are hypothetical right now) into just the first, but that trips on these maintainers with commas. Ultimately we should expect that the Maintainer: field from dpkg-parsechangelog is in (a subset of) RFC5322 recipient field format. In that format, any commas would need to be quoted. So: If the Maintainer field from dpkg-parsechangelog has a comma which has no @ or " before it, then we consider it a single old-school comma-containing maintainer. If it were intended as multiple maintainers, then the first maintainer has no email address. Not coping properly with that very-hypothetical future seems OK. We simply delete the comma, so that the things we record in the git history are more conservative. If there is a " we leave things untouched in the hope that this is a single address, albeit with some quoting. The alternative would be to try to use a full RFC5322 parser. That's quite a risky change. Perhaps we will revisit this after stretch. For now this Closes:#852661. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-import-chk: Test commit authorshipIan Jackson2017-02-05
| | | | | | | Check that commits have smae authorship as appears in the changelog. (Or, at least, the same authorship set.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not fail when run with detached HEAD. Closes:#853022.Ian Jackson2017-02-05
| | | | | | | | | | | | | | Specifically: * Pass -q to git-symbolic-ref. That means that it doesn't print an error message when HEAD is not a symbolic ref (ie, a detached head), and it means that the exit status is then 1 rather than 128. * If the return value from cmdoutput_errok is undef, check $? (which is the exit status <<8) and then simply pass on the undef. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Strip initial newline from Changes line from dpkg-parsechangelogIan Jackson2017-02-05
| | | | | | so as to avoid blank line in commit messages. Closes:#853093. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: quilt-useremail: New test for user config copyingIan Jackson2017-02-05
| | | | | | Test for #853085. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Copy several user.* settings from main tree git local configIan Jackson2017-02-05
| | | | | | Copy to dgit private workarea. Closes:#853085. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.10~Ian Jackson2017-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.9debian/3.9archive/debian/3.9Ian Jackson2017-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Quote sample clone commandsSean Whitton2017-01-25
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Get git clone url right. Closes:#852609.Ian Jackson2017-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: overwrite-chkclog: test UNRELEASED handling.Ian Jackson2017-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit --overwrite: Check $gf->('Distribution')Ian Jackson2017-01-25
| | | | | | | | | | | | | Check that the overwritten version's changelog entry is not UNRELEASED. This could easily happen if this release was being made from a git branch which predates the previous package upload, with working practices which commit finalised UNRELEASED changelog entries with the complete version number for the next upload. (Such practices seem quite common.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.9~Ian Jackson2017-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.8debian/3.8archive/debian/3.8Ian Jackson2017-01-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: defdistro-setup: Test that setup-* functions distro selection works.Ian Jackson2017-01-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* config and suite handling: Make dgit-setup-* work in default distro.Ian Jackson2017-01-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.8~Ian Jackson2017-01-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* finalise 3.7debian/3.7archive/debian/3.7Ian Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Documemnt dgit-maint-merge changesIan Jackson2017-01-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Makefile: New %.view target:Ian Jackson2017-01-21
| | | | | | `make dgit-maint-merge.7.view' runs `man -l ...' Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: defdistro-dsd-clone-drs: New testIan Jackson2017-01-21
| | | | | | Would have detected #851906 (and hopefully #850521). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document fixes to repos_server_urlIan Jackson2017-01-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.7~Ian Jackson2017-01-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.6debian/3.6archive/debian/3.6Ian Jackson2017-01-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: aptget archive access methodPeter Michael Green2017-01-19
| | | | | Add dummy implementation of file_in_archive_aptget copied from file_in_archive_dummycat. Re:#851697.
* infrastructure: Do not reject commits with no author/committer nameIan Jackson2017-01-18
| | | | | | | | | | | But still insist on email address and date). Peter Green reports that eg 71e128629ec786f3 in upstream xen.git is such a commit (and is accepted by github). Closes:#851716. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* infrastructure: Properly honour NOCOMMITCHECK policy hook exit status.Ian Jackson2017-01-18
| | | | | | Closes:#851800. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: downstream-gitless: Test import of .dsc with unsafe url.Ian Jackson2017-01-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: downstream-gitless: Test import of .dsc from unknown distro.Ian Jackson2017-01-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: git_lrfetch_sane: Take $url, and pass it right value in importIan Jackson2017-01-18
| | | | | | | This means we actually use the url from a Dgit .dsc field naming an unknown distro. Closes:#851728. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: git_get_config: Use confess, not croakIan Jackson2017-01-18
| | | | | | Using croak was simply a mistake. I always wanted a stack trace. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Call `confess' when shellquote gets an undef argIan Jackson2017-01-18
| | | | | | | | This can happen if a command (eg passed to debugcmd) has an undef argument. This turns an undefined warning into an explicit internal error. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.6~Ian Jackson2017-01-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.5debian/3.5archive/debian/3.5Ian Jackson2017-01-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: gardeningIan Jackson2017-01-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clonee: Do setup_new_tree earlier.Ian Jackson2017-01-17
| | | | | | | This avoids printing a spurious warning about actually-defused gitattributes when cloning. Closes:#851624. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Defuse gitattributes in private working area, alwaysIan Jackson2017-01-17
| | | | | | | Even if we don't do it in the user's tree because config setup-gitattributes=false. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Improve comment left in .git/info/attributes.Ian Jackson2017-01-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 3.5~Ian Jackson2017-01-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 3.4debian/3.4archive/debian/3.4Ian Jackson2017-01-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: worktrees: Replace references to /home/ianIan Jackson2017-01-16
| | | | | | | | | | Replace with references to /nonexistent, to catch inadvertant accesses. Now `git-grep /home/ian' produces only one hit - in a commit message, where it's harmless. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 15:35:24 +0000