Skip to content

Commit

Permalink
Cleanups afture running vulture.
Browse files Browse the repository at this point in the history
  • Loading branch information
allenh1 committed Dec 28, 2017
1 parent 424e624 commit ac010ca
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 29 deletions.
4 changes: 0 additions & 4 deletions superflore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
except (ImportError, OSError):
__version__ = 'unset'

from .repo_instance import BranchException
from .repo_instance import CloneException
from .repo_instance import RepoInstance

__all__ = [
'BranchException',
'CloneException',
'RepoInstance'
]
15 changes: 3 additions & 12 deletions superflore/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ def run(self, rm=True, show_cmd=False):
if i != len(self.bash_cmds) - 1:
cmd_string += ' && '
cmd_string += "'"
msg = "Running container with command string '%s'..."
info(msg % cmd_string)
if show_cmd:
msg = "Running container with command string '%s'..."
info(msg % cmd_string)

self.client.containers.run(
image=self.image,
Expand All @@ -56,13 +57,3 @@ def run(self, rm=True, show_cmd=False):
volumes=self.directory_map,
)
ok("Docker container exited.")


class BuildException(Exception):
def __init__(self, message):
self.message = message


class RunException(Exception):
def __init__(self, message):
self.message = message
2 changes: 1 addition & 1 deletion superflore/generators/bitbake/yocto_recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def get_src_location(self):
dirs[4], dirs[5],
dirs[6]).replace('.tar.gz', '')

def get_recipe_text(self, distributor, license_text, die_msg=None):
def get_recipe_text(self, distributor, license_text):
"""
Generate the Yocto Recipe, given the distributor line
and the license text.
Expand Down
10 changes: 0 additions & 10 deletions superflore/repo_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,3 @@ def pull_request(self, message, title, branch='master', remote='origin'):
target_remote='{0}'.format(remote),
)
ok('Successfully filed a pull request.')


class CloneException(Exception):
def __init__(self, message):
self.message = message


class BranchException(Exception):
def __init__(self, message):
self.message = message
3 changes: 1 addition & 2 deletions superflore/rosdep_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ def resolve_rosdep_key(
os_name,
os_version,
ros_distro=None,
ignored=None,
retry=True
ignored=None
):
ignored = ignored or []
ctx = create_default_installer_context()
Expand Down

0 comments on commit ac010ca

Please sign in to comment.