[javapackages] Arrgh... I meant RPM_BUILD_DIR of course
by Michal Srb
commit c2f8d4cb842ed6192d6a0dd2d2132b0afe922c32
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 22:08:57 2014 +0200
Arrgh... I meant RPM_BUILD_DIR of course
depgenerators/maven.req | 16 ++++++++--------
depgenerators/osgi.req | 5 +++--
python/javapackages/common/config.py | 8 ++++++++
python/javapackages/common/osgi.py | 5 +++--
test/test_common.py | 5 +++--
5 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 717e215..e0532b3 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -43,7 +43,7 @@ import pickle
from lxml import etree
-from javapackages.common.config import get_configs, get_buildroot
+from javapackages.common.config import get_configs, get_builddir
from javapackages.maven.pom import POM
from javapackages.maven.artifact import Artifact
from javapackages.metadata.metadata import Metadata, MetadataInvalidException
@@ -103,10 +103,10 @@ class TagBuilder(object):
self.metadata_dir = os.path.dirname(paths[0])
metadata_paths = None
metadata = None
- buildroot = get_buildroot()
+ builddir = get_builddir()
try:
- cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'r')
+ cachefile = open(os.path.join(builddir, '.provided_artifacts.cache'), 'r')
self.provided_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -115,11 +115,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_artifacts.extend(metadata.get_provided_artifacts())
- cachefile = open(os.path.join(buildroot,'.provided_artifacts.cache'), 'w')
+ cachefile = open(os.path.join(builddir,'.provided_artifacts.cache'), 'w')
pickle.dump(self.provided_artifacts, cachefile)
cachefile.close()
try:
- cachefile = open(os.path.join(buildroot, '.provided_osgi.cache'), 'r')
+ cachefile = open(os.path.join(builddir, '.provided_osgi.cache'), 'r')
self.provided_osgi = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -128,11 +128,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_osgi.extend(metadata.get_osgi_provides())
- cachefile = open(os.path.join(buildroot, '.provided_osgi.cache'), 'w')
+ cachefile = open(os.path.join(builddir, '.provided_osgi.cache'), 'w')
pickle.dump(self.provided_osgi, cachefile)
cachefile.close()
try:
- cachefile = open(os.path.join(buildroot, '.skipped_artifacts.cache'), 'r')
+ cachefile = open(os.path.join(builddir, '.skipped_artifacts.cache'), 'r')
self.skipped_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -141,7 +141,7 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.skipped_artifacts.extend(metadata.get_skipped_artifacts())
- cachefile = open(os.path.join(buildroot, '.skipped_artifacts.cache'), 'w')
+ cachefile = open(os.path.join(builddir, '.skipped_artifacts.cache'), 'w')
pickle.dump(self.skipped_artifacts, cachefile)
cachefile.close()
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index f3aba00..4de2070 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -43,11 +43,12 @@ class TagBuilder(object):
filelist = sys.stdin
paths = [x.rstrip() for x in filelist.readlines()]
buildroot = config.get_buildroot()
+ builddir = config.get_builddir()
# get all provided bundles
provided = []
try:
- cachefile = open(os.path.join(buildroot, '.provided_bundles.cache'), 'r')
+ cachefile = open(os.path.join(builddir, '.provided_bundles.cache'), 'r')
provided = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -59,7 +60,7 @@ class TagBuilder(object):
if not manifest:
continue
provided.append(osgi.OsgiProvideInfo.from_manifest(manifest))
- cachefile = open(os.path.join(buildroot, '.provided_bundles.cache'), 'w')
+ cachefile = open(os.path.join(builddir, '.provided_bundles.cache'), 'w')
pickle.dump(provided, cachefile)
cachefile.close()
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index 24b7b6b..42aabcf 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -32,3 +32,11 @@ def get_buildroot():
except KeyError:
raise Exception("RPM_BUILD_ROOT environment is not set")
return os.path.abspath(buildroot)
+
+
+def get_builddir():
+ try:
+ builddir = os.environ['RPM_BUILD_DIR']
+ except KeyError:
+ raise Exception("RPM_BUILD_DIR environment is not set")
+ return os.path.abspath(builddir)
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
index ad17a3a..99147b8 100644
--- a/python/javapackages/common/osgi.py
+++ b/python/javapackages/common/osgi.py
@@ -143,10 +143,11 @@ def get_requires_from_manifest(manifest):
def look_for_path_in_metadata(path):
buildroot = config.get_buildroot()
+ builddir = config.get_builddir()
artifacts = []
try:
- cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'r')
+ cachefile = open(os.path.join(builddir, '.provided_artifacts.cache'), 'r')
artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -160,7 +161,7 @@ def look_for_path_in_metadata(path):
try:
mdata = Metadata(metadata_paths)
artifacts = mdata.get_provided_artifacts()
- cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'w')
+ cachefile = open(os.path.join(builddir, '.provided_artifacts.cache'), 'w')
pickle.dump(artifacts, cachefile)
cachefile.close()
except MetadataInvalidException:
diff --git a/test/test_common.py b/test/test_common.py
index 553967a..760bbea 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -125,7 +125,8 @@ def osgiprov(filelist):
scriptpath = path.join(DIRPATH, '..', 'depgenerators', 'osgi.prov')
stdin = "\n".join(filelist)
(stdout, stderr, return_value) = call_script(scriptpath,
- [], stdin=stdin, wrapped=True, extra_env={"RPM_BUILD_ROOT":"/dev/null"})
+ [], stdin=stdin, wrapped=True, extra_env={"RPM_BUILD_ROOT":"/dev/null",
+ "RPM_BUILD_DIR":"/tmp"})
fun(self, stdout, stderr, return_value)
return test_decorated
return test_decorator
@@ -135,7 +136,7 @@ def requires_generator(name, filelist, config=None, javaconfdirs=None):
def test_decorated(self):
scriptpath = path.join(DIRPATH, '..', 'depgenerators', name)
stdin = build_depmap_paths(filelist)
- env = {"RPM_BUILD_ROOT":"/tmp"}
+ env = {"RPM_BUILD_DIR":"/tmp"}
if javaconfdirs:
confdirs = [os.path.join(DIRPATH, conf) for conf in javaconfdirs]
env['JAVACONFDIRS'] = os.pathsep.join(confdirs)
9 years, 10 months
[javapackages] [osgi.req] Fix import
by Michal Srb
commit 1318abe70302592f07ef3619367230de60dedf71
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 18:40:59 2014 +0200
[osgi.req] Fix import
depgenerators/osgi.req | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 9c05b58..f3aba00 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -31,7 +31,7 @@
# Authors: Alexander Kurtakov <akurtako(a)redhat.com>
import javapackages.common.osgi as osgi
-import javapackages.common.config
+import javapackages.common.config as config
import sys
import pickle
import os
9 years, 10 months
[javapackages] Store cache files in buildroot
by Michal Srb
commit 64e4cccb8404a43635a72486227484cd952968b3
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 18:29:32 2014 +0200
Store cache files in buildroot
Storing them in /tmp wasn't good idea...
depgenerators/maven.req | 15 ++++++++-------
depgenerators/osgi.req | 10 ++++------
python/javapackages/common/config.py | 8 ++++++++
python/javapackages/common/osgi.py | 10 ++++------
test/maven_req_test.py | 6 +++---
test/test_common.py | 2 +-
6 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index fe4ef5f..717e215 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -43,7 +43,7 @@ import pickle
from lxml import etree
-from javapackages.common.config import get_configs
+from javapackages.common.config import get_configs, get_buildroot
from javapackages.maven.pom import POM
from javapackages.maven.artifact import Artifact
from javapackages.metadata.metadata import Metadata, MetadataInvalidException
@@ -103,9 +103,10 @@ class TagBuilder(object):
self.metadata_dir = os.path.dirname(paths[0])
metadata_paths = None
metadata = None
+ buildroot = get_buildroot()
try:
- cachefile = open('/tmp/.provided_artifacts.cache', 'r')
+ cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'r')
self.provided_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -114,11 +115,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_artifacts.extend(metadata.get_provided_artifacts())
- cachefile = open('/tmp/.provided_artifacts.cache', 'w')
+ cachefile = open(os.path.join(buildroot,'.provided_artifacts.cache'), 'w')
pickle.dump(self.provided_artifacts, cachefile)
cachefile.close()
try:
- cachefile = open('/tmp/.provided_osgi.cache', 'r')
+ cachefile = open(os.path.join(buildroot, '.provided_osgi.cache'), 'r')
self.provided_osgi = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -127,11 +128,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_osgi.extend(metadata.get_osgi_provides())
- cachefile = open('/tmp/.provided_osgi.cache', 'w')
+ cachefile = open(os.path.join(buildroot, '.provided_osgi.cache'), 'w')
pickle.dump(self.provided_osgi, cachefile)
cachefile.close()
try:
- cachefile = open('/tmp/.skipped_artifacts.cache', 'r')
+ cachefile = open(os.path.join(buildroot, '.skipped_artifacts.cache'), 'r')
self.skipped_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -140,7 +141,7 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.skipped_artifacts.extend(metadata.get_skipped_artifacts())
- cachefile = open('/tmp/.skipped_artifacts.cache', 'w')
+ cachefile = open(os.path.join(buildroot, '.skipped_artifacts.cache'), 'w')
pickle.dump(self.skipped_artifacts, cachefile)
cachefile.close()
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index d9e6d8a..9c05b58 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -31,6 +31,7 @@
# Authors: Alexander Kurtakov <akurtako(a)redhat.com>
import javapackages.common.osgi as osgi
+import javapackages.common.config
import sys
import pickle
import os
@@ -41,15 +42,12 @@ class TagBuilder(object):
if filelist == None:
filelist = sys.stdin
paths = [x.rstrip() for x in filelist.readlines()]
- try:
- buildroot = os.environ['RPM_BUILD_ROOT']
- except KeyError:
- raise Exception("RPM_BUILD_ROOT environment is not set")
+ buildroot = config.get_buildroot()
# get all provided bundles
provided = []
try:
- cachefile = open('/tmp/.provided_bundles.cache', 'r')
+ cachefile = open(os.path.join(buildroot, '.provided_bundles.cache'), 'r')
provided = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -61,7 +59,7 @@ class TagBuilder(object):
if not manifest:
continue
provided.append(osgi.OsgiProvideInfo.from_manifest(manifest))
- cachefile = open('/tmp/.provided_bundles.cache', 'w')
+ cachefile = open(os.path.join(buildroot, '.provided_bundles.cache'), 'w')
pickle.dump(provided, cachefile)
cachefile.close()
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index bb838c6..24b7b6b 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -24,3 +24,11 @@ def get_configs(cfg_paths=None):
print >> sys.stderr, "Unable to open config file {path}".format(path=file_path)
pass
return configs
+
+
+def get_buildroot():
+ try:
+ buildroot = os.environ['RPM_BUILD_ROOT']
+ except KeyError:
+ raise Exception("RPM_BUILD_ROOT environment is not set")
+ return os.path.abspath(buildroot)
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
index 6d454dd..ad17a3a 100644
--- a/python/javapackages/common/osgi.py
+++ b/python/javapackages/common/osgi.py
@@ -36,6 +36,7 @@ import pickle
import zipfile
from zipfile import ZipFile
+import config
from javapackages.metadata.metadata import Metadata, MetadataInvalidException
@@ -141,14 +142,11 @@ def get_requires_from_manifest(manifest):
def look_for_path_in_metadata(path):
- try:
- buildroot = os.environ['RPM_BUILD_ROOT']
- except KeyError:
- raise Exception("RPM_BUILD_ROOT environment is not set")
+ buildroot = config.get_buildroot()
artifacts = []
try:
- cachefile = open('/tmp/.provided_artifacts.cache', 'r')
+ cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'r')
artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -162,7 +160,7 @@ def look_for_path_in_metadata(path):
try:
mdata = Metadata(metadata_paths)
artifacts = mdata.get_provided_artifacts()
- cachefile = open('/tmp/.provided_artifacts.cache', 'w')
+ cachefile = open(os.path.join(buildroot, '.provided_artifacts.cache'), 'w')
pickle.dump(artifacts, cachefile)
cachefile.close()
except MetadataInvalidException:
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
index cbd4805..3a99d39 100644
--- a/test/maven_req_test.py
+++ b/test/maven_req_test.py
@@ -7,9 +7,9 @@ class TestMavenReq(unittest.TestCase):
def tearDown(self):
try:
- os.remove(".provided_artifacts.cache")
- os.remove(".provided_osgi.cache")
- os.remove(".skipped_artifacts.cache")
+ os.remove("/tmp/.provided_artifacts.cache")
+ os.remove("/tmp/.provided_osgi.cache")
+ os.remove("/tmp/.skipped_artifacts.cache")
except OSError:
pass
diff --git a/test/test_common.py b/test/test_common.py
index 2745785..553967a 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -135,7 +135,7 @@ def requires_generator(name, filelist, config=None, javaconfdirs=None):
def test_decorated(self):
scriptpath = path.join(DIRPATH, '..', 'depgenerators', name)
stdin = build_depmap_paths(filelist)
- env = {}
+ env = {"RPM_BUILD_ROOT":"/tmp"}
if javaconfdirs:
confdirs = [os.path.join(DIRPATH, conf) for conf in javaconfdirs]
env['JAVACONFDIRS'] = os.pathsep.join(confdirs)
9 years, 10 months
[javapackages] [config] Fix syntax error
by Michal Srb
commit 38995f917cddf4882298865bb0f3955b191eedf0
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 17:46:47 2014 +0200
[config] Fix syntax error
python/javapackages/common/config.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index 27553c4..bb838c6 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -21,6 +21,6 @@ def get_configs(cfg_paths=None):
with open(file_path) as config_file:
configs.append(json.load(config_file))
except (OSError, IOError):
- print("Unable to open config file {path}", file_path, file=sys.stderr)
+ print >> sys.stderr, "Unable to open config file {path}".format(path=file_path)
pass
return configs
9 years, 10 months
[javapackages] [config] Scream if config file cannot be opened
by Michal Srb
commit a1a62c8c54124848393d793f9cb95bf3df9498a1
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 17:34:21 2014 +0200
[config] Scream if config file cannot be opened
python/javapackages/common/config.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index e94fb0d..27553c4 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -1,4 +1,5 @@
import os
+import sys
import json
@@ -20,5 +21,6 @@ def get_configs(cfg_paths=None):
with open(file_path) as config_file:
configs.append(json.load(config_file))
except (OSError, IOError):
+ print("Unable to open config file {path}", file_path, file=sys.stderr)
pass
return configs
9 years, 10 months
[javapackages] Store cache files in /tmp
by Michal Srb
commit 59dfbe7557f3e9d8905415f1f0c6012acafa9ff1
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 17:33:38 2014 +0200
Store cache files in /tmp
depgenerators/maven.req | 12 ++++++------
depgenerators/osgi.req | 4 ++--
python/javapackages/common/osgi.py | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index a770d99..fe4ef5f 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -105,7 +105,7 @@ class TagBuilder(object):
metadata = None
try:
- cachefile = open('.provided_artifacts.cache', 'r')
+ cachefile = open('/tmp/.provided_artifacts.cache', 'r')
self.provided_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -114,11 +114,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_artifacts.extend(metadata.get_provided_artifacts())
- cachefile = open('.provided_artifacts.cache', 'w')
+ cachefile = open('/tmp/.provided_artifacts.cache', 'w')
pickle.dump(self.provided_artifacts, cachefile)
cachefile.close()
try:
- cachefile = open('.provided_osgi.cache', 'r')
+ cachefile = open('/tmp/.provided_osgi.cache', 'r')
self.provided_osgi = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -127,11 +127,11 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.provided_osgi.extend(metadata.get_osgi_provides())
- cachefile = open('.provided_osgi.cache', 'w')
+ cachefile = open('/tmp/.provided_osgi.cache', 'w')
pickle.dump(self.provided_osgi, cachefile)
cachefile.close()
try:
- cachefile = open('.skipped_artifacts.cache', 'r')
+ cachefile = open('/tmp/.skipped_artifacts.cache', 'r')
self.skipped_artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -140,7 +140,7 @@ class TagBuilder(object):
if not metadata:
metadata = Metadata(metadata_paths)
self.skipped_artifacts.extend(metadata.get_skipped_artifacts())
- cachefile = open('.skipped_artifacts.cache', 'w')
+ cachefile = open('/tmp/.skipped_artifacts.cache', 'w')
pickle.dump(self.skipped_artifacts, cachefile)
cachefile.close()
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index df41cb5..d9e6d8a 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -49,7 +49,7 @@ class TagBuilder(object):
# get all provided bundles
provided = []
try:
- cachefile = open('.provided_bundles.cache', 'r')
+ cachefile = open('/tmp/.provided_bundles.cache', 'r')
provided = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -61,7 +61,7 @@ class TagBuilder(object):
if not manifest:
continue
provided.append(osgi.OsgiProvideInfo.from_manifest(manifest))
- cachefile = open('.provided_bundles.cache', 'w')
+ cachefile = open('/tmp/.provided_bundles.cache', 'w')
pickle.dump(provided, cachefile)
cachefile.close()
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
index 5e4efa7..6d454dd 100644
--- a/python/javapackages/common/osgi.py
+++ b/python/javapackages/common/osgi.py
@@ -148,7 +148,7 @@ def look_for_path_in_metadata(path):
artifacts = []
try:
- cachefile = open('.provided_artifacts.cache', 'r')
+ cachefile = open('/tmp/.provided_artifacts.cache', 'r')
artifacts = pickle.load(cachefile)
cachefile.close()
except IOError:
@@ -162,7 +162,7 @@ def look_for_path_in_metadata(path):
try:
mdata = Metadata(metadata_paths)
artifacts = mdata.get_provided_artifacts()
- cachefile = open('.provided_artifacts.cache', 'w')
+ cachefile = open('/tmp/.provided_artifacts.cache', 'w')
pickle.dump(artifacts, cachefile)
cachefile.close()
except MetadataInvalidException:
9 years, 10 months