rosdep patch from #3239
This commit is contained in:
parent
6d3e8311df
commit
a923343b89
|
@ -49,6 +49,7 @@ import time
|
||||||
|
|
||||||
import rosdep.base_rosdep
|
import rosdep.base_rosdep
|
||||||
import rosdep.debian as debian
|
import rosdep.debian as debian
|
||||||
|
import rosdep.opensuse as opensuse
|
||||||
import rosdep.redhat as redhat
|
import rosdep.redhat as redhat
|
||||||
import rosdep.gentoo as gentoo
|
import rosdep.gentoo as gentoo
|
||||||
import rosdep.macports as macports
|
import rosdep.macports as macports
|
||||||
|
@ -286,7 +287,7 @@ Rules for %s do not match:
|
||||||
|
|
||||||
class Rosdep:
|
class Rosdep:
|
||||||
def __init__(self, packages, command = "rosdep", robust = False):
|
def __init__(self, packages, command = "rosdep", robust = False):
|
||||||
os_list = [debian.RosdepTestOS(), debian.Debian(), debian.Ubuntu(), debian.Mint(), redhat.Fedora(), redhat.Rhel(), arch.Arch(), macports.Macports(), gentoo.Gentoo(), cygwin.Cygwin(), freebsd.FreeBSD()]
|
os_list = [debian.RosdepTestOS(), debian.Debian(), debian.Ubuntu(), debian.Mint(), opensuse.OpenSuse(), redhat.Fedora(), redhat.Rhel(), arch.Arch(), macports.Macports(), gentoo.Gentoo(), cygwin.Cygwin(), freebsd.FreeBSD()]
|
||||||
# Make sure that these classes are all well formed.
|
# Make sure that these classes are all well formed.
|
||||||
for o in os_list:
|
for o in os_list:
|
||||||
if not isinstance(o, rosdep.base_rosdep.RosdepBaseOS):
|
if not isinstance(o, rosdep.base_rosdep.RosdepBaseOS):
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
# Copyright (c) 2009, Willow Garage, Inc.
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
# modification, are permitted provided that the following conditions are met:
|
||||||
|
#
|
||||||
|
# * Redistributions of source code must retain the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer.
|
||||||
|
# * Redistributions in binary form must reproduce the above copyright
|
||||||
|
# notice, this list of conditions and the following disclaimer in the
|
||||||
|
# documentation and/or other materials provided with the distribution.
|
||||||
|
# * Neither the name of the Willow Garage, Inc. nor the names of its
|
||||||
|
# contributors may be used to endorse or promote products derived from
|
||||||
|
# this software without specific prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
# POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
# Author Tully Foote/tfoote@willowgarage.com
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
import roslib.os_detect
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
import rosdep.base_rosdep
|
||||||
|
|
||||||
|
class ZypperInstall:
|
||||||
|
"""This class provides the functions for installing using zypper
|
||||||
|
it's methods partially implement the Rosdep OS api to complement
|
||||||
|
the roslib.OSDetect API. """
|
||||||
|
def rpm_detect(self, p):
|
||||||
|
return subprocess.call(['rpm', '-q', p], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
|
||||||
|
def strip_detected_packages(self, packages):
|
||||||
|
return [p for p in packages if self.rpm_detect(p)]
|
||||||
|
|
||||||
|
def generate_package_install_command(self, packages, default_yes):
|
||||||
|
if not packages:
|
||||||
|
return "#No Packages to install"
|
||||||
|
|
||||||
|
if default_yes:
|
||||||
|
return "#Packages\nsudo zypper install -yl " + ' '.join(packages)
|
||||||
|
else:
|
||||||
|
return "#Packages\nsudo zypper install " + ' '.join(packages)
|
||||||
|
|
||||||
|
|
||||||
|
###### OpenSuse SPECIALIZATION #########################
|
||||||
|
class OpenSuse(roslib.os_detect.OpenSuse, ZypperInstall, rosdep.base_rosdep.RosdepBaseOS):
|
||||||
|
"""This class provides the Rosdep OS API for by combining the OpenSuse
|
||||||
|
OSDetect API and the YumInstall API
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
###### END OpenSuse SPECIALIZATION ########################
|
Loading…
Reference in New Issue