commit e5095ae68bd59a72c7d776c3c0ccc13e562996c0
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jul 26 09:25:31 2013 +0200
Revert "maven_depmap.py: Use dict-based string formatting where possible"
This reverts commit b9da0875f218674dfa3fab3693e21d68dc9e2861.
This commit caused a regression. Additional mappings stopped working
with javapackages 2.0.0.
Bug reported by Roland Grunberg at
http://bugzilla.redhat.com/988462
java-utils/maven_depmap.py | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 9933ed4..fb109fe 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -219,17 +219,18 @@ def output_fragment(fragment_path, fragment, mappings,
add_versions):
ffile.write("""
<dependency>
<maven>
- <groupId>%(gid)s</groupId>
- <artifactId>%(aid)s</artifactId>
- <version>%(version)s</version>
+ <groupId>%s</groupId>
+ <artifactId>%s</artifactId>
+ <version>%s</version>
</maven>
<jpp>
- <groupId>%(local_gid)s</groupId>
- <artifactId>%(local_aid)s</artifactId>
- <version>%(version)s</version>
+ <groupId>%s</groupId>
+ <artifactId>%s</artifactId>
+ <version>%s</version>
</jpp>
</dependency>
-""" % fragment)
+""" % (gid, aid, ver, fragment.local_gid,
+ fragment.local_aid, ver) )
# Add a file to a ZIP archive (or JAR, WAR, ...) unless the file