Skip to content

Commit 0df164b

Browse files
committed
Revert "Put files in update folder..."
This reverts commit 6c7a882. I was worried that there is no logic to handle conflicts and putting it here would just be a further duplication of logic. So we'll go back to having it be "invisible", requiring --update update to apply.
1 parent e25e84a commit 0df164b

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

src/main/java/net/imagej/updater/CommandLine.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@
8484
* {@code deactivate-update-site}, will stage changes without applying them.
8585
* If there is an {@code update} subdir, this will have any prospective changes
8686
* that can be applied automatically on the next ImageJ launch. Some commands
87-
* might not create the staging directory though, e.g. the {@code db.xml.gz} is
88-
* updated but no files are staged, in which case the {@code update} directive
89-
* can be used to apply the changes.
87+
* (such as {@code add-update-site}), do not create the staging directory
88+
* though, e.g. the {@code db.xml.gz} is updated but no files are staged, in
89+
* which case the {@code update} directive can be used to apply the changes.
9090
*
9191
* @author Johannes Schindelin
9292
*/
@@ -1267,17 +1267,6 @@ public void addOrEditUploadSite(final String name, final String url,
12671267
try {
12681268
// Update the db.xml.gz
12691269
files.write();
1270-
// Generate FileObjects for the new update site's files
1271-
files.reloadCollectionAndChecksum(progress);
1272-
// Flag any files in need of update
1273-
for (FileObject file : files.forUpdateSite(name)) {
1274-
if (file.getStatus() != Status.INSTALLED
1275-
&& !file.stageForUpdate(files, false)) {
1276-
log.warn("Skipping " + file.filename);
1277-
}
1278-
}
1279-
// Stage changes on disk in the update folder
1280-
new Installer(files, progress).start();
12811270
} catch (final Exception e) {
12821271
UpdaterUserInterface.get().handleException(e);
12831272
throw die("Could not write local file database");

0 commit comments

Comments
 (0)