| Summary: | dev-vcs/bzr-git-0.6.8 with dev-vcs/git-1.8.3.2 - file collision in /usr/bin/git-remote-bzr | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Sławomir Nizio <slawomir.nizio> |
| Component: | New packages | Assignee: | bazaar+obsolete |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | robbat2 |
| Priority: | Normal | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 480306 | ||
I don't know if it's a good idea but…
--- setup.py.orig 2013-07-16 18:34:17.074836269 +0000
+++ setup.py 2013-07-16 18:34:24.807892339 +0000
@@ -30,7 +30,7 @@
package_dir={'bzrlib.plugins.git':'.'},
packages=['bzrlib.plugins.git',
'bzrlib.plugins.git.tests'],
- scripts=['bzr-receive-pack', 'bzr-upload-pack', 'git-remote-bzr'],
+ scripts=['bzr-receive-pack', 'bzr-upload-pack'],
classifiers=[
'Topic :: Software Development :: Version Control',
'Environment :: Plugins',
and 'bzr branch <git repository>' and a few other quickly tested commands work.
Same problem here. Also, when having only current dev-vcs/git installed (dev-vcs/bzr-git and its requirement dev-python/dulwich uninstalled because of the collision), I experienced several breakages in bzr such as:
bzr: ERROR: No module named dir
You may need to install this Python library separately.
and
> bzr help git
(from memory:)
No module help
and of course messages about dulwich not being installed, all within normal bzr-only operation and no .git tree in sight.
So it appears that the change suggested in #1 makes a lot of sense...
Fixed in git-1.8.4 by moving the file to the git-core directory. |
# emerge -a git::gentoo [ebuild N ] dev-vcs/git-1.8.3.2 USE="blksha1 curl gpg iconv nls pcre perl python threads webdav -cgi -cvs -doc -emacs -gnome-keyring -gtk -highlight (-ppcsha1) -subversion {-test} -tk -xinetd" PYTHON_SINGLE_TARGET="python2_7 -python2_5 -python2_6" PYTHON_TARGETS="python2_7 -python2_5 -python2_6" ... * Detected file collision(s): * * /usr/bin/git-remote-bzr * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * dev-vcs/bzr-git-0.6.8:0::gentoo * /usr/bin/git-remote-bzr