Your message dated Wed, 03 Aug 2016 05:36:24 +0000
with message-id <[email protected]>
and subject line Bug#833066: fixed in git-buildpackage 0.8.2
has caused the Debian Bug report #833066,
regarding pq fails on patches with crlf line endings
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
833066: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833066
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.8.1
Severity: normal
Reproduce with
reproduce
$ gbp import-dsc --download
http://security.debian.org/debian-security/pool/updates/main/r/ruby-activerecord-3.2/ruby-activerecord-3.2_3.2.6-5+deb7u2.dsc
$ gbp pq import
gbp:info: Trying to apply patches at
'cce3e1e7c24d70a7b9de1cb1c2f360e9684c35f0'
gbp:warning: Patch 'Remove_rubygems_dependency.patch' has no authorship
information, using 'Debian Ruby Extras Maintainers
<[email protected]>'
gbp:error: Failed to apply
'debian/patches/3-2-dynamic_finder_injection.patch': Error running git apply:
debian/patches/3-2-dynamic_finder_injection.patch:21: trailing whitespace.
options = if arguments.length > attribute_names.size
debian/patches/3-2-dynamic_finder_injection.patch:22: trailing whitespace.
arguments.extract_options!
debian/patches/3-2-dynamic_finder_injection.patch:23: trailing whitespace.
else
debian/patches/3-2-dynamic_finder_injection.patch:24: trailing whitespace.
{}
debian/patches/3-2-dynamic_finder_injection.patch:25: trailing whitespace.
end
error: patch failed: lib/active_record/dynamic_matchers.rb:40
error: lib/active_record/dynamic_matchers.rb: patch does not apply
gbp:error: Couldn't apply patches
$ file debian/patches/3-2-dynamic_finder_injection.patch
debian/patches/3-2-dynamic_finder_injection.patch: unified diff output, ASCII
text, with CRLF line terminators
Cheers,
-- Guido
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'),
(500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.6.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.16.6
ii git 1:2.8.1-1
ii man-db 2.7.5-1
ii python-dateutil 2.4.2-1
ii python-pkg-resources 20.10.1-1.1
ii python-six 1.10.0-3
pn python:any <none>
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.80
ii pbuilder 0.225.2
ii pristine-tar 1.34
ii python-requests 2.10.0-2
ii sbuild 0.69.0-2
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-4
ii sudo 1.8.17p1-2
ii unzip 6.0-20
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.8.2
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 02 Aug 2016 19:26:33 +0200
Source: git-buildpackage
Binary: git-buildpackage git-buildpackage-rpm
Architecture: source all
Version: 0.8.2
Distribution: experimental
Urgency: medium
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
git-buildpackage-rpm - Suite to help with RPM packages in Git repositories
Closes: 825536 832016 833066 833143
Changes:
git-buildpackage (0.8.2) experimental; urgency=medium
.
* [1f0013c] import-orig: Switch to Debian branch before merging in changes
otherwise we'd always merge into the current working copy
(Closes: #832016)
* [a52aff5] download_orig: unlink file before raising the exception
otherwise we would not clean up
* [3d261da] import_orig: Only try rollbacks if necessary.
* [61e659d] pq: strip comments with multiple leading whitespace. Really
Closes: #825536
* [68940fb] pq: Retry patch with whitespace fixup on failure. This helps
patches with CRLF line endings and we don't lose anything since we'd
failed otherwise anyway. (Closes: #833066)
* [e2671b9] docs: fix --postclone and --hooks options of git-clone.
Thanks to IOhannes m zmoelnig for pointing this out
* [e68a0a1] docs: Document --postclone hook behaviour with debian/gbp.conf
Thanks to IOhannes m zmoelnig for pointing this out
(Closes: #833143)
Checksums-Sha1:
3e441e344ef2f0e3416a6494eea8c28fa412d9de 2101 git-buildpackage_0.8.2.dsc
be1cfbd43b0a307c7ae4604e48ac4aa2307bc393 1707824 git-buildpackage_0.8.2.tar.xz
da234017eab7ca0c6d5c9e6e68f45636c5d3e147 98158
git-buildpackage-rpm_0.8.2_all.deb
60bd89f4f2b641650891930e486833d4d083f055 345728 git-buildpackage_0.8.2_all.deb
Checksums-Sha256:
2bcef3cc8e5e64a299330e0e0d460e7196b39d117e03ff2fcb94c82d8483a978 2101
git-buildpackage_0.8.2.dsc
72f55192cd8b734d652571f30915f0daa220f159bdb6b6d22cd1f259e205c097 1707824
git-buildpackage_0.8.2.tar.xz
d2f32ac612544acf1d6fc3ffe05afd7bac3a1997f720051c3475b0ead15328b1 98158
git-buildpackage-rpm_0.8.2_all.deb
d3148785d72005466ed457ba47db8b7e517aa4b7cd63022ab83e9a41f5ef65ef 345728
git-buildpackage_0.8.2_all.deb
Files:
3ce48797ef112bba7142e22e4214ba99 2101 vcs optional git-buildpackage_0.8.2.dsc
24d11d15e6aa448bb92d49b520b5ce8b 1707824 vcs optional
git-buildpackage_0.8.2.tar.xz
b90d6ec1c44a752188a9d25c18cef4ef 98158 vcs optional
git-buildpackage-rpm_0.8.2_all.deb
fd968fbdc7b45683e147872132909480 345728 vcs optional
git-buildpackage_0.8.2_all.deb
-----BEGIN PGP SIGNATURE-----
iQIcBAEBCAAGBQJXoYEIAAoJEAe4t7DqmBIL924P/RG1ddefQyRUzKI9Xjf8RQkL
GZ+TkCv97xRLolQqVFxgWPA8Cka+Lx0Yzk8IAWrTh4d15V1nODCp26AvQrU7OrZG
jLd+f2RC6C7ALwnVleR/X9vc82WrKJsmWkGOyyQYUQdO56H5LUsG/6mkvz1JIH2x
L1PAZ57S93wQjb7REyXU13Ae992M9RmUwVESBolkFQl28WG7uR4ZAtEc5HJxHjeR
3wHQRc1qALfMuxQE3thcloaJnttP5bl9TZdBisepbkMNTYQqxtVep5N0Ypz14QIO
+FByJW2Bhb9tVXCl2tzSinCPu8npBV7bNenILi+pEATnU+C/maAVpElIMdUMYD9s
li2DV1NWsN9SYh2P7nevdzjKzHEJ6Pdxb4x2mmYUSQdWVo/6pvJcDFIO5j6D3Qum
NpG84RvU8pnWH2Cs5Dp4xAfaDI1DFjjC2WJh3SaZPnzfQ9/d7vxZqEA7Lfno4WMH
9936K4m0ybCIniRKvcbNuH1Fan8Ef+sfE779xy+6fq5hWPvlpaeih9Qp515k8UMq
DnVV6ZQqCFurd+tzjt7JVc6w9j+Ff1ng6ofzGUrt+dsxLzVhwrhHGRbRSNP6ZogM
PRjgUXT8Ex34DAr6LL1T9Du9H6ZnGHVm4z7zeT9yRRqHC6M9lY3O/xwsXVzPFFbe
+nteanyD24oOAEzUaVL1
=EEAw
-----END PGP SIGNATURE-----
--- End Message ---
