bodewig 2003/01/27 08:19:03
Modified: src/main/org/apache/tools/ant/taskdefs Tar.java
Log:
<tar>'s up-to-date check didn't work for nested filesets.
PR: 14995
Revision Changes Path
1.39 +12 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Tar.java 4 Dec 2002 16:42:30 -0000 1.38
+++ Tar.java 27 Jan 2003 16:19:02 -0000 1.39
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -266,7 +266,7 @@
TarFileSet fs = (TarFileSet) e.nextElement();
String[] files = fs.getFiles(getProject());
- if (!archiveIsUpToDate(files)) {
+ if (!archiveIsUpToDate(files, fs.getDir(getProject()))) {
upToDate = false;
}
@@ -429,7 +429,17 @@
}
}
+ /**
+ * @deprecated use the two-arg version instead.
+ */
protected boolean archiveIsUpToDate(String[] files) {
+ return archiveIsUpToDate(files, baseDir);
+ }
+
+ /**
+ * @since Ant 1.5.2
+ */
+ protected boolean archiveIsUpToDate(String[] files, File dir) {
SourceFileScanner sfs = new SourceFileScanner(this);
MergingMapper mm = new MergingMapper();
mm.setTo(tarFile.getAbsolutePath());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
