Skip to content

Commit

Permalink
meta: fix formatting with latest black
Browse files Browse the repository at this point in the history
  • Loading branch information
no92 authored and ArsenArsen committed Oct 27, 2023
1 parent bb93fd6 commit ce6dda1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
14 changes: 7 additions & 7 deletions xbstrap/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2836,7 +2836,7 @@ def add_source_dependencies(s):
item.require_edges.add((action.PATCH_SRC, dep_source))

def add_tool_dependencies(s):
for (tool_name, stage_name) in s.tool_stage_dependencies:
for tool_name, stage_name in s.tool_stage_dependencies:
dep_tool = self._cfg.get_tool_pkg(tool_name)
if self.build_scope is not None and dep_tool not in self.build_scope:
item.require_edges.add((action.WANT_TOOL, dep_tool))
Expand Down Expand Up @@ -3073,14 +3073,14 @@ def activate(root_action, root_subject):
visit(item.require_edges)

# Activate wanted items.
for (action, subject) in self.wanted:
for action, subject in self.wanted:
item = self._items[(action, subject)]
item.build_span = True
if not self.check or item.is_missing:
activate(action, subject)

# Discover all items reachable by build edges.
for (action, subject) in reversed(self._order):
for action, subject in reversed(self._order):
item = self._items[(action, subject)]
if not item.build_span:
continue
Expand All @@ -3098,7 +3098,7 @@ def is_outdated(item, dep_item):
return False
return dep_ts > ts

for (action, subject) in self._order:
for action, subject in self._order:
item = self._items[(action, subject)]
# Unless we're doing a recursive update, we only follow check items
# that are reachable by build edges.
Expand Down Expand Up @@ -3160,7 +3160,7 @@ def run_plan(self):
_util.log_info("Running the following plan:")
else:
_util.log_info("Nothing to do")
for (action, subject) in scheduled:
for action, subject in scheduled:
if isinstance(subject, HostStage):
if subject.stage_name:
eprint(
Expand Down Expand Up @@ -3199,7 +3199,7 @@ def run_plan(self):
return

any_failed_items = False
for (n, (action, subject)) in enumerate(scheduled):
for n, (action, subject) in enumerate(scheduled):
item = self._items[(action, subject)]

# Check if any prerequisites failed; this can generally only happen with --keep-going.
Expand Down Expand Up @@ -3329,7 +3329,7 @@ def emit_progress(status):

if any_failed_items:
_util.log_info("The following steps failed:")
for (action, subject) in scheduled:
for action, subject in scheduled:
item = self._items[(action, subject)]
assert item.exec_status != ExecutionStatus.NULL
if item.exec_status == ExecutionStatus.SUCCESS:
Expand Down
4 changes: 2 additions & 2 deletions xbstrap/pipeline/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def do_compute_graph(args):
"architecture": af.architecture,
}
)
for (action, subject) in plan.materialized_steps():
for action, subject in plan.materialized_steps():
if action == xbstrap.base.Action.WANT_TOOL:
if subject in job.tools:
continue
Expand Down Expand Up @@ -237,7 +237,7 @@ def do_compute_graph(args):
plan.wanted.update([(xbstrap.base.Action.RUN, task)])
plan.compute_plan(no_ordering=True)

for (action, subject) in plan.materialized_steps():
for action, subject in plan.materialized_steps():
if action == xbstrap.base.Action.WANT_TOOL:
if subject in item.job.tools:
continue
Expand Down
1 change: 0 additions & 1 deletion xbstrap/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ def build_environ_paths(environ, varname, prepend):


def interactive_download(url, path):

istty = os.isatty(1) # This is stdout.
if istty:
eprint("...", end="") # This will become the status line.
Expand Down

0 comments on commit ce6dda1

Please sign in to comment.