Commit3fc81dd

authored and

committed

merge.py: Use git ls-files to get list of downstream PO files

The previous method could lead to problems if a dependency installedwithin venv/ shipped with its own PO files.

1 parent7b54943 commit3fc81ddCopy full SHA for 3fc81dd

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,8 @@ def main():`
`123`	`123`	`forfileinpot_path.glob("*/.pot")`
`124`	`124`	`}`
`125`	`125`	`downstream= {`
`126`		`-po`
`127`		`-forpoinPath(".").glob("*/.po")`
`128`		`-ifnot (po.is_relative_to(Path("locales"))orpo.is_relative_to(Path(".git")))`
	`126`	`+Path(po)`
	`127`	`+forpoinrun("git","ls-files","*.po",stdout=PIPE).stdout.splitlines()`
`129`	`128`	`}`
`130`	`129`	`copy_new_files(upstream-downstream,pot_path=pot_path)`
`131`	`130`	`update_known_files(upstream&downstream,pot_path=pot_path)`

Comments

(0)