commit dca4acc305392da0828db11c24be706ecc97c027
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 13:29:23 2015 +0200
Adapt to strutils changes
depgenerators/maven.prov | 2 +-
depgenerators/maven.req | 8 ++++----
java-utils/builddep.py | 2 +-
python/javapackages/common/osgi.py | 4 ++--
python/javapackages/common/util.py | 6 ------
python/javapackages/maven/artifact.py | 9 ++++-----
python/javapackages/metadata/alias.py | 2 +-
python/javapackages/metadata/artifact.py | 16 ++++++++--------
python/javapackages/metadata/dependency.py | 8 ++++----
python/javapackages/metadata/exclusion.py | 2 +-
python/javapackages/metadata/skippedartifact.py | 2 +-
11 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
index 3d2546d..4da95b9 100755
--- a/depgenerators/maven.prov
+++ b/depgenerators/maven.prov
@@ -58,7 +58,7 @@ class TagBuilder:
provides = set()
for artifact in metadata.artifacts:
provides.add(artifact.get_rpm_str(namespace=artifact.namespace,
- pkgver=artifact.version))
+ pkg_ver=artifact.version))
# print OSGi provides from metadata
osgi_provides = metadata.get_osgi_provides()
for p in osgi_provides:
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 39a56db..9409de8 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -142,7 +142,7 @@ class TagBuilder(object):
# check if dependency is NOT provided by currently
# processed subpackage
if not dep.is_provided_by(metadata.artifacts)[0]:
- req_str = dep.get_rpm_str(pkgver=dver,
+ req_str = dep.get_rpm_str(pkg_ver=dver,
namespace=artifact.namespace)
pom_requires.add(req_str)
elif r:
@@ -197,12 +197,12 @@ class TagBuilder(object):
if not dependency.is_provided_by(metadata.artifacts)[0]:
# requires on subpackages are always versioned
rpmstr = dependency.get_rpm_str(namespace=dependency.namespace,
- compat=dependency.resolvedVersion,
- pkgver=pkgver)
+
compat_ver=dependency.resolvedVersion,
+ pkg_ver=pkgver)
requires.add(rpmstr)
else:
rpmstr = dependency.get_rpm_str(namespace=dependency.namespace,
- compat=dependency.resolvedVersion)
+ compat_ver=dependency.resolvedVersion)
requires.add(rpmstr)
if unknown_deps:
diff --git a/java-utils/builddep.py b/java-utils/builddep.py
index e8de664..fda36d2 100644
--- a/java-utils/builddep.py
+++ b/java-utils/builddep.py
@@ -64,7 +64,7 @@ if __name__ == "__main__":
deps = et.findall('./dependency')
for dep in deps:
art = Artifact.from_xml_element(dep)
- print(art.get_rpm_str(compat=art.version))
+ print(art.get_rpm_str(compat_ver=art.version))
except (ArtifactValidationException, ArtifactFormatException) as e:
parser.error("{e}: Provided artifact strings were invalid. "
"Please see help and check your arguments".format(e=e))
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
index 6e8ff26..9f9bac7 100644
--- a/python/javapackages/common/osgi.py
+++ b/python/javapackages/common/osgi.py
@@ -35,7 +35,7 @@
import re
from javapackages.common.manifest import Manifest, ManifestException
-from javapackages.common.util import sanitize_version
+from javapackages.common.strutils import _sanitize_version
class OSGiUtils(object):
@@ -43,7 +43,7 @@ class OSGiUtils(object):
@staticmethod
def get_rpm_str(bundle, version="", namespace=""):
ns = namespace or ""
- version = sanitize_version(version)
+ version = _sanitize_version(version)
return "{ns}{d}osgi({bundle}){eq}{version}".format(ns=ns,
d="-" if ns else
"",
bundle=bundle,
diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py
index f31d5ee..add1322 100644
--- a/python/javapackages/common/util.py
+++ b/python/javapackages/common/util.py
@@ -116,9 +116,3 @@ def get_logger(name):
handler.setFormatter(formatter)
logger.addHandler(handler)
return logger
-
-
-def sanitize_version(version):
- if version:
- return version.replace("-", ".")
- return ""
diff --git a/python/javapackages/maven/artifact.py
b/python/javapackages/maven/artifact.py
index ea5fbdd..e85eeba 100644
--- a/python/javapackages/maven/artifact.py
+++ b/python/javapackages/maven/artifact.py
@@ -36,7 +36,7 @@ import re
import six
import javapackages.maven.pomreader as POMReader
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.exception import JavaPackagesToolsException
from lxml.etree import Element, SubElement, tostring
@@ -63,16 +63,15 @@ class AbstractArtifact(object):
cla=m['classifier'],
ver=m['version'])
- def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ def get_rpm_str(self, namespace=None, compat_ver=None, pkg_ver=None):
m = self.__get_members()
return Printer.get_rpm_str(m['groupId'],
m['artifactId'],
ext=m['extension'],
cla=m['classifier'],
- ver=m['version'],
namespace=namespace,
- compat=compat,
- pkgver=pkgver)
+ compat_ver=compat_ver,
+ pkg_ver=pkg_ver)
@staticmethod
def get_parts_from_mvn_str(mvnstr):
diff --git a/python/javapackages/metadata/alias.py
b/python/javapackages/metadata/alias.py
index eb6f5b0..90a3622 100644
--- a/python/javapackages/metadata/alias.py
+++ b/python/javapackages/metadata/alias.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding
diff --git a/python/javapackages/metadata/artifact.py
b/python/javapackages/metadata/artifact.py
index 958d28e..3593d76 100644
--- a/python/javapackages/metadata/artifact.py
+++ b/python/javapackages/metadata/artifact.py
@@ -35,7 +35,7 @@ import javapackages.common.config as config
from javapackages.common.osgi import OSGiBundle
from javapackages.maven.artifact import Artifact
from javapackages.maven.pom import POM
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.metadata.alias import MetadataAlias
from javapackages.metadata.dependency import MetadataDependency
@@ -90,7 +90,7 @@ class MetadataArtifact(ObjectBinding):
cla=self.classifier,
ver=self.version)
- def get_rpm_str(self, namespace="", pkgver=None):
+ def get_rpm_str(self, namespace=None, pkg_ver=None):
result = []
if not self.is_compat():
@@ -100,7 +100,7 @@ class MetadataArtifact(ObjectBinding):
ext=self.extension,
cla=self.classifier,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
# non-compat rpm string(s) for aliases
for alias in self.aliases:
@@ -109,7 +109,7 @@ class MetadataArtifact(ObjectBinding):
ext=alias.extension,
cla=alias.classifier,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
else:
# compat rpm string(s) for main artifact
for compat_ver in self.compatVersions:
@@ -117,9 +117,9 @@ class MetadataArtifact(ObjectBinding):
self.artifactId,
ext=self.extension,
cla=self.classifier,
- compat=compat_ver,
+ compat_ver=compat_ver,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
# compat rpm string(s) for aliases
for alias in self.aliases:
@@ -127,9 +127,9 @@ class MetadataArtifact(ObjectBinding):
alias.artifactId,
ext=alias.extension,
cla=alias.classifier,
- compat=compat_ver,
+ compat_ver=compat_ver,
namespace=namespace,
- pkgver=pkgver))
+ pkg_ver=pkg_ver))
return "\n".join(result)
def __unicode__(self):
diff --git a/python/javapackages/metadata/dependency.py
b/python/javapackages/metadata/dependency.py
index fa66257..8f843af 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.metadata.exclusion import MetadataExclusion
from javapackages.common.binding import ObjectBinding
@@ -62,14 +62,14 @@ class MetadataDependency(ObjectBinding):
cla=self.classifier,
ver=self.requestedVersion)
- def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ def get_rpm_str(self, namespace=None, compat_ver=None, pkg_ver=None):
return Printer.get_rpm_str(self.groupId,
self.artifactId,
ext=self.extension,
cla=self.classifier,
namespace=namespace or self.namespace,
- compat=compat or self.resolvedVersion,
- pkgver=pkgver)
+ compat_ver=compat_ver or self.resolvedVersion,
+ pkg_ver=pkg_ver)
def is_provided_by(self, artifacts):
for provided in artifacts:
diff --git a/python/javapackages/metadata/exclusion.py
b/python/javapackages/metadata/exclusion.py
index 286c8b7..3152b09 100644
--- a/python/javapackages/metadata/exclusion.py
+++ b/python/javapackages/metadata/exclusion.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding
diff --git a/python/javapackages/metadata/skippedartifact.py
b/python/javapackages/metadata/skippedartifact.py
index 640689f..84d3915 100644
--- a/python/javapackages/metadata/skippedartifact.py
+++ b/python/javapackages/metadata/skippedartifact.py
@@ -32,7 +32,7 @@
# Authors: Michal Srb <msrb(a)redhat.com>
from javapackages.maven.artifact import Artifact
-import javapackages.maven.printer as Printer
+import javapackages.common.strutils as Printer
from javapackages.common.binding import ObjectBinding