x/anvil
Code Issues Proposed changes

Merge "Reduce the visiblity of methods to be protected."

Browse Source
This commit is contained in:
Jenkins
2013-08-06 06:00:37 +00:00
committed by Gerrit Code Review
parent 4ae641e813 08eca92640
commit 8e0b2a82bf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
anvil/packaging/base.py
View File

@@ -142,8 +142,8 @@ class DependencyHandler(object):
i_pip.get('version'))
extra_pips.append(str(extra_req))
requires_files = filter(sh.isfile, requires_files)
self.gather_pips_to_install(requires_files, sorted(set(extra_pips)))
self.clean_pip_requires(requires_files)
self._gather_pips_to_install(requires_files, sorted(set(extra_pips)))
self._clean_pip_requires(requires_files)
def package_instance(self, instance):
pass
@@ -170,7 +170,7 @@ class DependencyHandler(object):
sh.deldir(d)
sh.unlink(self.tracereader.filename())
def clean_pip_requires(self, requires_files):
def _clean_pip_requires(self, requires_files):
# Fixup incompatible dependencies
if not (requires_files and self.forced_packages):
return
@@ -191,7 +191,7 @@ class DependencyHandler(object):
contents = "# Cleaned on %s\n\n%s\n" % (utils.iso8601(), "\n".join(new_lines))
sh.write_file_and_backup(fn, contents)
def gather_pips_to_install(self, requires_files, extra_pips=None):
def _gather_pips_to_install(self, requires_files, extra_pips=None):
"""Analyze requires_files and extra_pips.
Updates `self.forced_packages` and `self.pips_to_install`.
@@ -249,7 +249,7 @@ class DependencyHandler(object):
sh.write_file(self.forced_requires_filename,
"\n".join([str(req) for req in self.forced_packages]))
def filter_download_requires(self):
def _filter_download_requires(self):
"""Shrinks the pips that were downloaded into a smaller set.
:returns: a list of all requirements that must be downloaded
@@ -299,7 +299,7 @@ class DependencyHandler(object):
"""Download dependencies from `$deps_dir/download-requires`."""
# NOTE(aababilov): do not drop download_dir - it can be reused
sh.mkdirslist(self.download_dir, tracewriter=self.tracewriter)
pips_to_download = self.filter_download_requires()
pips_to_download = self._filter_download_requires()
sh.write_file(self.download_requires_filename,
"\n".join([str(req) for req in pips_to_download]))
if not pips_to_download:

10
anvil/packaging/yum.py
View File

@@ -112,7 +112,7 @@ class YumDependencyHandler(base.DependencyHandler):
except (TypeError, ValueError):
pass
def py2rpm_start_cmdline(self):
def _py2rpm_start_cmdline(self):
cmdline = [
self.py2rpm_executable,
"--rpm-base",
@@ -294,7 +294,7 @@ class YumDependencyHandler(base.DependencyHandler):
return (version, repo)
return (None, None)
def filter_download_requires(self):
def _filter_download_requires(self):
yum_map = self._get_known_yum_packages()
pip_origins = {}
for line in self.pips_to_install:
@@ -383,7 +383,7 @@ class YumDependencyHandler(base.DependencyHandler):
# Now build them into SRPM rpm files.
(_fn, content) = utils.load_template(sh.joinpths("packaging", "makefiles"), "source.mk")
scripts_dir = sh.abspth(sh.joinpths(settings.TEMPLATE_DIR, "packaging", "scripts"))
py2rpm_options = self.py2rpm_start_cmdline()[1:] + [
py2rpm_options = self._py2rpm_start_cmdline()[1:] + [
"--scripts-dir", scripts_dir,
"--source-only",
"--rpm-base", self.rpmbuild_dir,
@@ -567,7 +567,7 @@ class YumDependencyHandler(base.DependencyHandler):
def _build_from_app_dir(self, instance, params):
app_dir = instance.get_option('app_dir')
cmdline = self.py2rpm_start_cmdline()
cmdline = self._py2rpm_start_cmdline()
cmdline.extend(["--source-only"])
if 'release' in params:
cmdline.extend(["--release", params["release"]])
@@ -611,7 +611,7 @@ class YumDependencyHandler(base.DependencyHandler):
def _convert_names_python2rpm(self, python_names, only_name=True):
if not python_names:
return []
cmdline = self.py2rpm_start_cmdline() + ["--convert"] + python_names
cmdline = self._py2rpm_start_cmdline() + ["--convert"] + python_names
rpm_names = []
for line in sh.execute(cmdline)[0].splitlines():
# format is "Requires: rpm-name <=> X"