Don't try to set attributes of symbolic links

This commit is contained in:
Mikolaj Izdebski 2014-09-29 07:34:13 +02:00
parent fe8aa92d7c
commit 3cae384065
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 2566bd476a0036f91b610679eb5cc15aeae99612 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 29 Sep 2014 07:30:29 +0200
Subject: [PATCH] Don't try to set attributes of symbolic links
---
.../plexus/components/io/attributes/Java7AttributeUtils.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java
index 25bd452..e43f738 100644
--- a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java
+++ b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java
@@ -52,11 +52,8 @@ public static void chmod( File file, int mode )
throws IOException
{
final Path path = file.toPath();
- if (Files.isSymbolicLink( path )){
- if (Files.readSymbolicLink( path ).toFile().exists()){
- Files.setPosixFilePermissions( path, getPermissions( mode ) );
- }
- } else {
+ if ( !Files.isSymbolicLink( path ) )
+ {
Files.setPosixFilePermissions( path, getPermissions( mode ) );
}
}
--
1.9.3

View File

@ -1,6 +1,6 @@
Name: plexus-io
Version: 2.1.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Plexus IO Components
License: ASL 2.0
URL: http://plexus.codehaus.org/plexus-components/plexus-io
@ -9,6 +9,10 @@ BuildArch: noarch
Source0: https://github.com/sonatype/plexus-io/archive/plexus-io-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# Forwarded upstream: http://jira.codehaus.org/browse/PLXCOMP-244
# https://github.com/sonatype/plexus-io/pull/6
Patch0: 0001-Don-t-try-to-set-attributes-of-symbolic-links.patch
BuildRequires: plexus-utils
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-components-pom
@ -30,6 +34,7 @@ API documentation for %{name}.
%prep
%setup -q -n plexus-io-plexus-io-%{version}
cp %{SOURCE1} .
%patch0 -p1
%build
export XMVN_COMPILER_SOURCE="1.5"
@ -47,6 +52,9 @@ export XMVN_COMPILER_SOURCE="1.5"
%changelog
* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-2
- Don't try to set attributes of symbolic links
* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-1
- Update to upstream version 2.1.1
- Remove patch for PLXCOMP-241: accepted upstream