lint: scripts: clean up some more warnings after deleting local disables
BUG=chromium:431514
TEST=no more lint errors
TEST=`./cbuildbot/run_tests` passes
Change-Id: I74c77dc197e382f48dcd79300e562051e5b4c351
Reviewed-on: https://chromium-review.googlesource.com/240900
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index e794189..347df38 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -8,8 +8,6 @@
emerge-$board autotest-all, by simply rsync'ing changes from trunk to sysroot.
"""
-# pylint: disable=bad-continuation
-
from __future__ import print_function
import argparse
@@ -26,12 +24,11 @@
from chromite.lib import osutils
from chromite.lib import portage_util
-
if cros_build_lib.IsInsideChroot():
- # pylint: disable=F0401
# Only import portage after we've checked that we're inside the chroot.
import portage
+
INCLUDE_PATTERNS_FILENAME = 'autotest-quickmerge-includepatterns'
AUTOTEST_PROJECT_NAME = 'chromiumos/third_party/autotest'
AUTOTEST_EBUILD = 'chromeos-base/autotest'
@@ -50,7 +47,6 @@
ItemizedChange = namedtuple('ItemizedChange', ['change_description',
'absolute_path'])
-
# Data structure describing the rsync new/modified files or directories.
#
# new_files: A list of ItemizedChange objects for new files.
@@ -60,13 +56,13 @@
['new_files', 'modified_files',
'new_directories'])
+
class PortagePackageAPIError(Exception):
"""Exception thrown when unable to retrieve a portage package API."""
-
def GetNewestFileTime(path, ignore_subdirs=[]):
- # pylint: disable=W0102
+ # pylint: disable=dangerous-default-value
"""Recursively determine the newest file modification time.
Args:
@@ -89,8 +85,8 @@
command_result = cros_build_lib.RunCommand(command, error_code_ok=True,
capture_output=True)
float_times = [float(str_time) for str_time in
- command_result.output.split('\n')
- if str_time != '']
+ command_result.output.split('\n')
+ if str_time != '']
return max(float_times)
@@ -165,7 +161,7 @@
vartree is of type portage.dbapi.vartree.vartree
"""
if portage_root is None:
- # pylint: disable=E1101
+ # pylint: disable=no-member
portage_root = portage.root
# Ensure that portage_root ends with trailing slash.
portage_root = os.path.join(portage_root, '')
@@ -189,7 +185,7 @@
# Convert string match to package dblink.
package_cpv = matching_packages[0]
package_split = portage_util.SplitCPV(package_cpv)
- # pylint: disable=E1101
+ # pylint: disable=no-member
package = portage.dblink(package_split.category,
package_split.pv, settings=vartree.settings,
vartree=vartree)
@@ -264,7 +260,7 @@
e.g. '/build/lumpy/usr/local/build/autotest'
"""
osutils.RmDir(os.path.join(autotest_sysroot, 'packages'),
- ignore_missing=True)
+ ignore_missing=True)
osutils.SafeUnlink(os.path.join(autotest_sysroot, 'packages.checksum'))
@@ -334,7 +330,6 @@
'to emerge-$board autotest-all, by '
'rsyncing source tree to sysroot.')
-
default_board = cros_build_lib.GetDefaultBoard()
parser.add_argument('--board', metavar='BOARD', default=default_board,
help='Board to perform quickmerge for. Default: ' +
@@ -432,7 +427,6 @@
'.quickmerge_sentinel')
cros_build_lib.RunCommand(['touch', sentinel_filename])
-
if args.pretend:
logging.info('The following message is pretend only. No filesystem '
'changes made.')