reassign 578752 git
found 578752 1:1.7.0.4-2
affects 578752 git-buildpackage
retirle 578752 git-apply: doesn't handle filenames with spaces correctly
Thanks
Hi Giuseppe,
On Thu, Apr 22, 2010 at 03:48:12PM +0200, Giuseppe Iuculano wrote:
> Package: git-buildpackage
> Version: 0.4.65
> Severity: normal
> File: /usr/bin/git-import-dsc
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi,
>
> It seems git-import-dsc fails with chromium-browser in ubuntu:
>
> # git-import-dsc chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
> No git repository found, creating one.
> Initialized empty Git repository in
> /home/debian/chromium/chromium/chromium-browser/.git/
> tag upstream/5.0.342.9.r43360 not found, importing Upstream tarball
> pristine-tar: committed chromium-browser_5.0.342.9~r43360.orig.tar.gz.delta
> to branch pristine-tar
> Merging to master
> Already up-to-date.
> error: patch failed: debian/licenses/LICENSE.global:0
> error: debian/licenses/LICENSE.global: patch does not apply
> Error import
> /home/debian/chromium/chromium/chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz:
> 256
The bug is actually in git-apply. To reproduce:
Get the dsc and import it:
dget
https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
mkdir chromium-browser
cd chromium-browser
git init
git-import-orig ../chromium-browser_5.0.342.9~r43360.orig.tar.gz
Try applying the patch using patch:
gunzip -c ../chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz | patch
-p1 --dry-run
Works. Now use git-apply:
gunzip -c ../chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz | git
apply --check --index --apply --whitespace=nowarn -
Fails with:
error: patch failed: debian/licenses/LICENSE.global:0
error: debian/licenses/LICENSE.global: patch does not apply
The issue is that git-apply doesn't handle the filenames containing
spaces correctly like
'debian/licenses/LICENSE.global BSD-style Chromium' and
'debian/licenses/LICENSE.Apache (v2.0)'.
So I''m reassigning to git.
Cheers,
-- Guido
>
>
> To reproduce this issue: dget
> https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
>
> - -- System Information:
> Debian Release: squeeze/sid
> APT prefers testing-proposed-updates
> APT policy: (990, 'testing-proposed-updates'), (990, 'testing'), (990,
> 'stable'), (500, 'proposed-updates'), (500, 'oldstable'), (500, 'unstable'),
> (1, 'experimental')
> Architecture: i386 (i686)
>
> Kernel: Linux 2.6.32-3-686 (SMP w/2 CPU cores)
> Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
>
> Versions of packages git-buildpackage depends on:
> ii devscripts 2.10.61 scripts to make the life of a
> Debi
> ii git [git-core] 1:1.7.0.5-1 fast, scalable, distributed
> revisi
> ii git-core 1:1.7.0.5-1 fast, scalable, distributed
> revisi
> ii python 2.5.4-9 An interactive high-level
> object-o
> ii python-dateutil 1.4.1-3 powerful extensions to the
> standar
> ii python-support 1.0.7 automated rebuilding support for
> P
>
> Versions of packages git-buildpackage recommends:
> ii pristine-tar 1.01 regenerate pristine tarballs
>
> Versions of packages git-buildpackage suggests:
> ii git-load-dirs 1.1.8 Import upstream archives into git
>
> - -- no debconf information
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
>
> iEYEARECAAYFAkvQU5gACgkQNxpp46476apUAACdEzvjYdn+jZvadFwatKpV7Aks
> bJcAnjws7qxYILT0Q0SHXnqE275u/BMN
> =8mtA
> -----END PGP SIGNATURE-----
>
>
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
