[javapackages] Move socket_path back to top-level
by Michael Šimáček
commit 47ecfd4b671ef99ad49c4c129e186e0ff5720df7
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed May 13 14:26:19 2015 +0200
Move socket_path back to top-level
python/javapackages/common/mock.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/common/mock.py b/python/javapackages/common/mock.py
index 8f5fd8c..e115c46 100644
--- a/python/javapackages/common/mock.py
+++ b/python/javapackages/common/mock.py
@@ -33,11 +33,13 @@
from __future__ import print_function
+import os
import socket
from javapackages.common.exception import JavaPackagesToolsException
from javapackages.maven.artifact import Artifact
+socket_path = os.environ.get('PM_REQUEST_SOCKET')
class InstallationException(JavaPackagesToolsException):
def __init__(self, dep, out):
@@ -49,7 +51,6 @@ class ConnectionException(JavaPackagesToolsException):
pass
def install_artifact(dep):
- socket_path = os.environ.get('PM_REQUEST_SOCKET')
if not socket_path:
raise ConnectionException("PM_REQUEST_SOCKET environment variable not set")
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
9 years
[javapackages] Use PM_REQUEST_SOCKET environment variable
by Michael Šimáček
commit 8eba83350ef31fc4ccd71662a518107d45b94ed2
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed May 13 14:15:36 2015 +0200
Use PM_REQUEST_SOCKET environment variable
python/javapackages/common/mock.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/common/mock.py b/python/javapackages/common/mock.py
index d34b12d..8f5fd8c 100644
--- a/python/javapackages/common/mock.py
+++ b/python/javapackages/common/mock.py
@@ -38,7 +38,6 @@ import socket
from javapackages.common.exception import JavaPackagesToolsException
from javapackages.maven.artifact import Artifact
-socket_path = '/var/run/mock/pm-request'
class InstallationException(JavaPackagesToolsException):
def __init__(self, dep, out):
@@ -50,6 +49,9 @@ class ConnectionException(JavaPackagesToolsException):
pass
def install_artifact(dep):
+ socket_path = os.environ.get('PM_REQUEST_SOCKET')
+ if not socket_path:
+ raise ConnectionException("PM_REQUEST_SOCKET environment variable not set")
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
try:
sock.connect(socket_path)
9 years
[javapackages] Split fedora-review-java plugin out of jp
by Michael Šimáček
commit a6230e405c744e785363984cdbfa483efbc2afc7
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Mon Apr 20 17:34:03 2015 +0200
Split fedora-review-java plugin out of jp
fedora-review/java_guidelines.py | 489 --------------------------------------
install | 4 -
2 files changed, 0 insertions(+), 493 deletions(-)
---
diff --git a/install b/install
index cb8bfff..9b3cdf5 100755
--- a/install
+++ b/install
@@ -213,10 +213,6 @@ exec >files-gradle
inst_exec target/gradle-local "${bindir}"
inst_data gradle/init.gradle "${datadir}/gradle-local"
-
-exec >files-fedora-review
-inst_data fedora-review/java_guidelines.py "${datadir}/fedora-review/plugins"
-
exec >files-doc
inst_doc doc/index.html
inst_doc doc/images
9 years
Broken dependencies: maven-wagon
by Fedora Koji Build System
maven-wagon has broken dependencies in the F-22 tree:
On x86_64:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On i386:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On armhfp:
maven-wagon-webdav-jackrabbit-2.8-1.fc22.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
Please resolve this as soon as possible.
9 years
Broken dependencies: maven-wagon
by Fedora Koji Build System
maven-wagon has broken dependencies in the rawhide tree:
On x86_64:
maven-wagon-webdav-jackrabbit-2.9-1.fc23.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On i386:
maven-wagon-webdav-jackrabbit-2.9-1.fc23.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
On armhfp:
maven-wagon-webdav-jackrabbit-2.9-1.fc23.noarch requires mvn(org.apache.jackrabbit:jackrabbit-webdav)
Please resolve this as soon as possible.
9 years
[javapackages] Add gradle-local script
by Mikolaj Izdebski
commit 769a20eda74b9488bd7f3caac3970984831f8d2b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 12 09:57:48 2015 +0200
Add gradle-local script
bin/gradle-local | 2 ++
build | 1 +
gradle/init.gradle | 11 +++++++++++
install | 6 ++++++
4 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/bin/gradle-local b/bin/gradle-local
new file mode 100755
index 0000000..7098e2e
--- /dev/null
+++ b/bin/gradle-local
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec gradle -I %{datadir}/gradle-local/init.gradle "${@}"
diff --git a/build b/build
index 2e0292c..24f1ffd 100755
--- a/build
+++ b/build
@@ -77,6 +77,7 @@ expand bin/clean-binary-files
expand bin/create-jar-links
expand bin/diff-jars
expand bin/find-jar
+expand bin/gradle-local
expand bin/jvmjar
expand bin/rebuild-jar-repository
expand bin/shade-jar
diff --git a/gradle/init.gradle b/gradle/init.gradle
new file mode 100644
index 0000000..17c9afe
--- /dev/null
+++ b/gradle/init.gradle
@@ -0,0 +1,11 @@
+allprojects {
+ buildscript {
+ repositories {
+ xmvn()
+ }
+ }
+
+ repositories {
+ xmvn()
+ }
+}
diff --git a/install b/install
index 2db5685..cb8bfff 100755
--- a/install
+++ b/install
@@ -208,6 +208,12 @@ inst_data configs/ivy-local-classpath "${sysconfdir}/ant.d"
inst_data configs/ivysettings.xml "${sysconfdir}/ivy"
+exec >files-gradle
+
+inst_exec target/gradle-local "${bindir}"
+inst_data gradle/init.gradle "${datadir}/gradle-local"
+
+
exec >files-fedora-review
inst_data fedora-review/java_guidelines.py "${datadir}/fedora-review/plugins"
9 years
[javapackages] Fix hardlink creation (rhbz#1220469)
by Mikolaj Izdebski
commit fa2494ad6e5b52b0e0abad2eeeda009721ebd61e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 12 10:02:34 2015 +0200
Fix hardlink creation (rhbz#1220469)
java-utils/java-functions | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/java-functions b/java-utils/java-functions
index d36f091..00f952a 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -360,7 +360,7 @@ link_jar_repository() {
while [ $# -gt 0 ] ; do
case "$1" in
-h|--hard)
- _LINK_CMD="ln -f"
+ _LINK_CMD="ln -fL"
;;
-s|--soft|--symbolic)
_LINK_CMD="ln -fs"
9 years
