itFix bug where pool would get replaced where it should not be - amprolla - devuan's apt repo merger Err parazyd.org 70 hgit clone git://parazyd.org/amprolla.git URL:git://parazyd.org/amprolla.git parazyd.org 70 1Log /git/amprolla/log.gph parazyd.org 70 1Files /git/amprolla/files.gph parazyd.org 70 1Refs /git/amprolla/refs.gph parazyd.org 70 1README /git/amprolla/file/README.md.gph parazyd.org 70 1LICENSE /git/amprolla/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit d4d4fd651230b146c9cfd2bd0f2cf1e31e97deaf /git/amprolla/commit/d4d4fd651230b146c9cfd2bd0f2cf1e31e97deaf.gph parazyd.org 70 1parent c73141415de27ba59e5035366f9cfe42c20d7bac /git/amprolla/commit/c73141415de27ba59e5035366f9cfe42c20d7bac.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Mon, 4 Dec 2017 17:36:08 +0100 Err parazyd.org 70 i Err parazyd.org 70 iFix bug where pool would get replaced where it should not be Err parazyd.org 70 i Err parazyd.org 70 iReported by: Daniel Abrecht Err parazyd.org 70 i Err parazyd.org 70 ihttps://lists.dyne.org/lurker/message/20171204.155159.5b3b95fb.en.html Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M amprolla_merge.py | 4 ++-- Err parazyd.org 70 i Err parazyd.org 70 i1 file changed, 2 insertions(+), 2 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/amprolla_merge.py b/amprolla_merge.py /git/amprolla/file/amprolla_merge.py.gph parazyd.org 70 it@@ -60,10 +60,10 @@ def devuan_rewrite(pkg, repo_name): Err parazyd.org 70 i Err parazyd.org 70 i if 'Filename' in pkg and repos[repo_name]['name'] not in pkg['Filename']: Err parazyd.org 70 i pkg['Filename'] = pkg['Filename'].replace('pool/', 'pool/%s/' % Err parazyd.org 70 i- repos[repo_name]['name']) Err parazyd.org 70 i+ repos[repo_name]['name'], 1) Err parazyd.org 70 i if 'Directory' in pkg and repos[repo_name]['name'] not in pkg['Directory']: Err parazyd.org 70 i pkg['Directory'] = pkg['Directory'].replace('pool/', 'pool/%s/' % Err parazyd.org 70 i- repos[repo_name]['name']) Err parazyd.org 70 i+ repos[repo_name]['name'], 1) Err parazyd.org 70 i Err parazyd.org 70 i return pkg Err parazyd.org 70 i Err parazyd.org 70 .