[Notes] [Git][BuildStream/buildstream][master] 2 commits: element.py: Expect absolute paths in overlap whitelists

[Jürg Billeter <gitlab mg gitlab com>]

Title: GitLab

Jürg Billeter pushed to branch master at BuildStream / buildstream

Commits:

• 1ae17968
  by Valentin David at 2019-02-19T09:01:48Z

  element.py: Expect absolute paths in overlap whitelists
  
  This allows use of variables such as %{prefix} and matches the
  documentation. This is a breaking change.
  
  Fixes #721
  

• afe823e8
  by Jürg Billeter at 2019-02-19T10:33:59Z

  Merge branch 'valentindavid/absolute-whitelist' into 'master'
  
  Allow absolute paths in whitelist
  
  Closes #721
  
  See merge request BuildStream/buildstream!968

5 changed files:

• NEWS
• buildstream/element.py
• tests/frontend/overlaps/a-whitelisted.bst
• tests/frontend/overlaps/b-whitelisted.bst
• tests/frontend/overlaps/c-whitelisted.bst

Changes:

NEWS

---

...	...	@@ -138,6 +138,9 @@ buildstream 1.3.1
138	138	o BREAKING CHANGE: Symlinks are no longer resolved during staging and absolute
139	139	symlinks are now preserved instead of being converted to relative symlinks.
140	140
	141	+ o BREAKING CHANGE: Overlap whitelists now require absolute paths. This allows
	142	+ use of variables such as %{prefix} and matches the documentation.
	143	+
141	144
142	145	=================
143	146	buildstream 1.1.5

buildstream/element.py

---

...	...	@@ -2609,7 +2609,7 @@ class Element(Plugin):
2609	2609	if include_file and not exclude_file:
2610	2610	yield filename.lstrip(os.sep)
2611	2611
2612		- def __file_is_whitelisted(self, pattern):
	2612	+ def __file_is_whitelisted(self, path):
2613	2613	# Considered storing the whitelist regex for re-use, but public data
2614	2614	# can be altered mid-build.
2615	2615	# Public data is not guaranteed to stay the same for the duration of
...	...	@@ -2621,7 +2621,7 @@ class Element(Plugin):
2621	2621	whitelist_expressions = [utils._glob2re(self.__variables.subst(exp.strip())) for exp in whitelist]
2622	2622	_expression_ = ('^(?:' + '|'.join(whitelist_expressions) + ')$')
2623	2623	self.__whitelist_regex = re.compile(_expression_)
2624		- return self.__whitelist_regex.match(pattern)
	2624	+ return self.__whitelist_regex.match(os.path.join(os.sep, path))
2625	2625
2626	2626	# __extract():
2627	2627	#

tests/frontend/overlaps/a-whitelisted.bst

---

...	...	@@ -10,4 +10,4 @@ sources:
10	10	public:
11	11	bst:
12	12	overlap-whitelist:
13		- - "file*"
	13	+ - "/file*"

tests/frontend/overlaps/b-whitelisted.bst

---

...	...	@@ -8,9 +8,9 @@ sources:
8	8	- kind: local
9	9	path: "b"
10	10	variables:
11		- FILE: file
	11	+ FILE: /file
12	12	public:
13	13	bst:
14	14	overlap-whitelist:
15		- - file2
	15	+ - /file2
16	16	- "%{FILE}3"

tests/frontend/overlaps/c-whitelisted.bst

---

...	...	@@ -8,4 +8,4 @@ sources:
8	8	public:
9	9	bst:
10	10	overlap-whitelist:
11		- - "file*"
	11	+ - "/file*"

—
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.