amprolla

commit a5d56d1eb501ba877b95ecbf846914db5b42b1a3
parent 6acb2ac57a529eb655c2a2df4c3dab0ed8934b90
Author: parazyd <parazyd@dyne.org>
Date:   Tue, 11 Jul 2017 13:56:56 +0200

don't rewrite package paths if they were rewritten already

this should allow for merging on top of already merged repositories

Diffstat:
M
amprolla_merge.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amprolla_merge.py b/amprolla_merge.py
@@ -57,10 +57,10 @@ def devuan_rewrite(pkg, repo_name):
     any attributes.
     """
 
-    if 'Filename' in pkg:
+    if 'Filename' in pkg and repos[repo_name]['name'] not in pkg['Filename']:
         pkg['Filename'] = pkg['Filename'].replace('pool/', 'pool/%s/' %
                                                   repos[repo_name]['name'])
-    if 'Directory' in pkg:
+    if 'Directory' in pkg and repos[repo_name]['name'] not in pkg['Directory']:
         pkg['Directory'] = pkg['Directory'].replace('pool/', 'pool/%s/' %
                                                     repos[repo_name]['name'])