ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1154951 - /ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java
Date Mon, 08 Aug 2011 13:10:46 GMT
Author: bodewig
Date: Mon Aug  8 13:10:45 2011
New Revision: 1154951

URL: http://svn.apache.org/viewvc?rev=1154951&view=rev
Log:
no, AR doesn't suppport directories

Modified:
    ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java

Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java?rev=1154951&r1=1154950&r2=1154951&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java Mon Aug 
8 13:10:45 2011
@@ -41,17 +41,11 @@ public class Ar extends ArchiveBase {
                 public ArchiveEntry buildEntry(ArchiveBase.ResourceWithFlags r) {
                     boolean isDir = r.getResource().isDirectory();
                     if (isDir) {
-                        // REVISIT
                         throw new BuildException(NO_DIRS_MESSAGE);
                     }
 
                     int mode = ArchiveFileSet.DEFAULT_FILE_MODE;
-                    if (!isDir && r.getCollectionFlags().hasModeBeenSet()) {
-                        mode = r.getCollectionFlags().getMode();
-                    } else if (isDir
-                               && r.getCollectionFlags().hasDirModeBeenSet()) {
-                        mode = r.getCollectionFlags().getDirMode();
-                    } else if (r.getResourceFlags().hasModeBeenSet()) {
+                    if (r.getCollectionFlags().hasModeBeenSet()) {
                         mode = r.getResourceFlags().getMode();
                     }
 



Mime
View raw message