Merge "releasetools: Fix the error message." (fea4263e) · Commits · e / os / android_build

tools/releasetools/build_image.py

+5 −21

Original line number	Diff line number	Diff line
		@@ -58,15 +58,9 @@ def GetDiskUsage(path):

		Returns:
		The number of bytes based on a 1K block_size.

		Raises:
		BuildImageError: On error.
		"""
		cmd = ["du", "-k", "-s", path]
		try:
		output = common.RunAndCheckOutput(cmd, verbose=False)
		except common.ExternalError:
		raise BuildImageError("Failed to get disk usage:\n{}".format(output))
		return int(output.split()[0]) * 1024


		@@ -78,15 +72,9 @@ def GetInodeUsage(path):

		Returns:
		The number of inodes used.

		Raises:
		BuildImageError: On error.
		"""
		cmd = ["find", path, "-print"]
		try:
		output = common.RunAndCheckOutput(cmd, verbose=False)
		except common.ExternalError:
		raise BuildImageError("Failed to get disk inode usage:\n{}".format(output))
		# increase by > 4% as number of files and directories is not whole picture.
		return output.count('\n') * 25 // 24

		@@ -99,17 +87,13 @@ def GetFilesystemCharacteristics(sparse_image_path):

		Returns:
		The characteristics dictionary.

		Raises:
		BuildImageError: On error.
		"""
		unsparse_image_path = UnsparseImage(sparse_image_path, replace=False)

		cmd = ["tune2fs", "-l", unsparse_image_path]
		try:
		output = common.RunAndCheckOutput(cmd, verbose=False)
		except common.ExternalError:
		raise BuildImageError("Failed to get tune2fs usage:\n{}".format(output))
		finally:
		os.remove(unsparse_image_path)
		fs_dict = {}
		for line in output.splitlines():