Skip to content

Fix handling of virtual packages #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjwwood merged 5 commits into from
Mar 21, 2018
Merged

Fix handling of virtual packages #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da90773
fix simulation output of install with subcommands
mathias-luedtke Feb 10, 2018
0897992
fix detection of installed virtual packages
mathias-luedtke Feb 10, 2018
aa2d4fb
test for missing package in apt-cache showpkg output
mathias-luedtke Mar 13, 2018
ef78d76
fix _read_apt_cache_showpkg
flixr Mar 14, 2018
4fd9938
add an unreleased package to apt-cache output
mathias-luedtke Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rosdep2/installers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def install_resolved(self, installer_key, resolved, simulate=False, interactive=
for sub_command in command:
if isinstance(sub_command[0], list):
sub_cmd_len = len(sub_command)
for cmd, i in enumerate(sub_command):
for i, cmd in enumerate(sub_command):
print(" '%s' (alternative %d/%d)" % (' '.join(cmd), i + 1, sub_cmd_len))
else:
print(' ' + ' '.join(sub_command))
Expand Down
12 changes: 8 additions & 4 deletions src/rosdep2/platforms/debian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def _read_apt_cache_showpkg(packages, exec_fn=None):
second, boolean, parameter.
"""

cmd = ['apt-cache', 'showpkg'] + list(packages)
cmd = ['apt-cache', 'showpkg'] + packages
if exec_fn is None:
exec_fn = read_stdout

Expand All @@ -115,7 +115,7 @@ def _read_apt_cache_showpkg(packages, exec_fn=None):
starts.append(std_out.index('Package: %s' % p, last_start))
except ValueError:
notfound.add(p)
starts.append(-1)
starts.append(None)

for p in packages:
if p in notfound:
Expand All @@ -142,7 +142,11 @@ def _read_apt_cache_showpkg(packages, exec_fn=None):
while next(lines) != 'Reverse Provides: ':
pass

yield p, True, [line.split(' ', 2)[0] for line in lines]
pr = [line.split(' ', 2)[0] for line in lines]
if pr:
yield p, True, pr
else:
yield p, False, None


def dpkg_detect(pkgs, exec_fn=None):
Expand Down Expand Up @@ -180,7 +184,7 @@ def dpkg_detect(pkgs, exec_fn=None):

# now for the remaining packages check, whether they are installed as
# virtual packages
remaining = _read_apt_cache_showpkg(p for p in pkgs if p not in installed_packages)
remaining = _read_apt_cache_showpkg(list(p for p in pkgs if p not in installed_packages))
virtual = [n for (n, v, pr) in remaining if v and len(dpkg_detect(pr)) > 0]

return installed_packages + virtual
Expand Down
8 changes: 8 additions & 0 deletions test/debian/showpkg-curl-wget-libcurl-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,11 @@ libcurl4-gnutls-dev 7.47.0-1ubuntu2.4 (= )
libcurl4-openssl-dev 7.47.0-1ubuntu2 (= )
libcurl4-nss-dev 7.47.0-1ubuntu2 (= )
libcurl4-gnutls-dev 7.47.0-1ubuntu2 (= )
Package: ros-kinetic-rc-genicam-api
Versions:

Reverse Depends:
ros-kinetic-rc-visard-driver,ros-kinetic-rc-genicam-api
Dependencies:
Provides:
Reverse Provides:
16 changes: 13 additions & 3 deletions test/test_rosdep_debian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ def test_read_apt_cache_showpkg():
m = Mock()
with open(os.path.join(get_test_dir(), 'showpkg-curl-wget-libcurl-dev'), 'r') as f:
m.return_value = f.read()

results = list(_read_apt_cache_showpkg(['curl', 'wget', 'libcurl-dev'], exec_fn=m))
assert len(results) == 3, results
pkgs = ['curl', 'wget', '_not_existing', 'libcurl-dev', 'ros-kinetic-rc-genicam-api']
results = list(_read_apt_cache_showpkg(pkgs, exec_fn=m))
assert len(results) == len(pkgs), results

package, virtual, providers = results[0]
assert package == 'curl', package
Expand All @@ -97,9 +97,19 @@ def test_read_apt_cache_showpkg():
assert providers is None, providers

package, virtual, providers = results[2]
assert package == '_not_existing', package
assert not virtual
assert providers is None, providers

package, virtual, providers = results[3]
assert package == 'libcurl-dev', package
assert virtual, providers

package, virtual, providers = results[4]
assert package == 'ros-kinetic-rc-genicam-api', package
assert not virtual
assert providers is None, providers


def test_AptInstaller():
from rosdep2.platforms.debian import AptInstaller
Expand Down