[Notes] [Git][BuildStream/buildstream][bst-1.2] 4 commits: source.py: Stylistic changes in Source.__do_fetch()

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch bst-1.2 at BuildStream / buildstream

Commits:

• 68b44195
  by Tristan Van Berkom at 2018-08-30T08:51:20Z

  source.py: Stylistic changes in Source.__do_fetch()
  
  Added some comments to make the flow easier to follow, and
  removed an annoying 'success' variabled in favor of a for / else
  loop statement.
  

• 88bdf22a
  by Tristan Van Berkom at 2018-08-30T08:51:41Z

  source.py: Move Source.mark_download_url() to the public methods.
  
  This was sitting in the section for abstract methods, but this
  is most definitely not an abstract method to be implemented by
  Sources.
  

• 813fcd60
  by Tristan Van Berkom at 2018-08-30T08:52:43Z

  plugins/source/git.py: Fix formatting of url in tracking
  
  This was displaying the aliased URL which is pretty useless,
  use the translated URL for the timed activity.
  

• 3086eda5
  by Tristan Van Berkom at 2018-08-30T09:17:43Z

  Merge branch 'tristan/source-mirroring-changes-1.2' into 'bst-1.2'
  
  Minor code changes revolving around source mirroring
  
  See merge request BuildStream/buildstream!759

2 changed files:

• buildstream/plugins/sources/git.py
• buildstream/source.py

Changes:

buildstream/plugins/sources/git.py

---

...	...	@@ -368,8 +368,10 @@ class GitSource(Source):
368	368	if not self.tracking:
369	369	return None
370	370
	371	+ # Resolve the URL for the message
	372	+ resolved_url = self.translate_url(self.mirror.url)
371	373	with self.timed_activity("Tracking {} from {}"
372		- .format(self.tracking, self.mirror.url),
	374	+ .format(self.tracking, resolved_url),
373	375	silent_nested=True):
374	376	self.mirror.ensure()
375	377	self.mirror._fetch()

buildstream/source.py

---

...	...	@@ -372,19 +372,6 @@ class Source(Plugin):
372	372	"""
373	373	self.stage(directory)
374	374
375		- def mark_download_url(self, url):
376		- """Identifies the URL that this Source uses to download
377		-
378		- This must be called during :func:`~buildstream.plugin.Plugin.configure` if
379		- :func:`~buildstream.source.Source.translate_url` is not called.
380		-
381		- Args:
382		- url (str): The url used to download
383		-
384		- *Since: 1.2*
385		- """
386		- self.__expected_alias = _extract_alias(url)
387		-
388	375	def get_source_fetchers(self):
389	376	"""Get the objects that are used for fetching
390	377
...	...	@@ -453,6 +440,19 @@ class Source(Plugin):
453	440	project = self._get_project()
454	441	return project.translate_url(url, first_pass=self.__first_pass)
455	442
	443	+ def mark_download_url(self, url):
	444	+ """Identifies the URL that this Source uses to download
	445	+
	446	+ This must be called during :func:`~buildstream.plugin.Plugin.configure` if
	447	+ :func:`~buildstream.source.Source.translate_url` is not called.
	448	+
	449	+ Args:
	450	+ url (str): The url used to download
	451	+
	452	+ *Since: 1.2*
	453	+ """
	454	+ self.__expected_alias = _extract_alias(url)
	455	+
456	456	def get_project_directory(self):
457	457	"""Fetch the project base directory
458	458
...	...	@@ -517,10 +517,12 @@ class Source(Plugin):
517	517	def _fetch(self):
518	518	project = self._get_project()
519	519	source_fetchers = self.get_source_fetchers()
	520	+
	521	+ # Use the source fetchers if they are provided
	522	+ #
520	523	if source_fetchers:
521	524	for fetcher in source_fetchers:
522	525	alias = fetcher._get_alias()
523		- success = False
524	526	for uri in project.get_alias_uris(alias, first_pass=self.__first_pass):
525	527	try:
526	528	fetcher.fetch(uri)
...	...	@@ -529,10 +531,16 @@ class Source(Plugin):
529	531	except BstError as e:
530	532	last_error = e
531	533	continue
532		- success = True
	534	+
	535	+ # No error, we're done with this fetcher
533	536	break
534		- if not success:
	537	+
	538	+ else:
	539	+ # No break occurred, raise the last detected error
535	540	raise last_error
	541	+
	542	+ # Default codepath is to reinstantiate the Source
	543	+ #
536	544	else:
537	545	alias = self._get_alias()
538	546	if self.__first_pass:
...	...	@@ -556,7 +564,11 @@ class Source(Plugin):
556	564	except BstError as e:
557	565	last_error = e
558	566	continue
	567	+
	568	+ # No error, we're done here
559	569	return
	570	+
	571	+ # Re raise the last detected error
560	572	raise last_error
561	573
562	574	# Wrapper for stage() api which gives the source

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.