[JENKINS-34122] Exclude output file from itself #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation. |
|
this looks ok, except for all the println |
batmat
approved these changes
Oct 30, 2016
| @@ -120,12 +120,23 @@ public ZipItFileCallable(FilePath zipFile, String glob) { | |||
|
|
|||
| @Override | |||
| public Integer invoke(File dir, VirtualChannel channel) throws IOException, InterruptedException { | |||
| String canonicalZip = new File(zipFile.getRemote()).getCanonicalPath(); | |||
| System.out.println("zipFileRemote is: " + zipFile.getRemote()); | |||
| System.out.println("canonicalZip is: " + canonicalZip); | |||
There was a problem hiding this comment.
Is this normal to sysout instead of logging?
| archiver.visit(new File(dir, path), path); | ||
| File toArchive = new File(dir, path).getCanonicalFile(); | ||
| if (toArchive.getPath().equals(canonicalZip)) { | ||
| System.out.println("Not archiving " + toArchive + " as this is the output zip itself"); |
| System.out.println("Not archiving " + toArchive + " as this is the output zip itself"); | ||
| } | ||
| else { | ||
| System.out.println("archiving " + toArchive + " as this is not excluded"); |
| ZipInputStream zip = new ZipInputStream(file.open()); | ||
| ZipEntry entry = zip.getNextEntry(); | ||
| while (entry != null && !entry.getName().equals("output.zip")) { | ||
| System.out.println("zip entry name is: " + entry.getName()); |
There was a problem hiding this comment.
Can live with it in a test, though I don't like it much.
|
Created #21 fixing merge conflicts and removed debug prints |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JENKINS-34122 Using configured value from the step, rather than the
FilePathto exclude is from theFileSetThis also fixes the unit tests so that they pass when run on windows.
@reviewbybees
obsoletes #18, and satisfies my commitment to a better fix without introducing the regression I identified.