commit 6b7806bae8e8b6b70bb669a7730ee75934f5e388
author Eike Stepper <stepper@esc-net.de> Fri Nov 19 04:25:20 2021 +0100
committer Eike Stepper <stepper@esc-net.de> Fri Nov 19 04:25:20 2021 +0100
tree 6251a9b9d58cb1290de8e4b0f06282a27195f7e8
parent 8d67a6d3ff14c7d2e9997b795522a171bee394e3

Don't process archived drops

org.eclipse.emf.cdo.releng.promotion/src/promoter/DropProcessor.java

diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/DropProcessor.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/DropProcessor.java
index 3650de1..14e47fa 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/DropProcessor.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/DropProcessor.java
@@ -48,24 +48,38 @@
   public List<BuildInfo> processDrops(XMLOutput xml) throws Exception
   {
     List<BuildInfo> buildInfos = new ArrayList<>();
-    processDrops(xml, buildInfos, PromoterConfig.INSTANCE.getArchiveDropsArea());
-    processDrops(xml, buildInfos, PromoterConfig.INSTANCE.getDropsArea());
+    processDrops(xml, true, buildInfos, PromoterConfig.INSTANCE.getArchiveDropsArea());
+    processDrops(xml, false, buildInfos, PromoterConfig.INSTANCE.getDropsArea());
     return buildInfos;
   }
 
-  protected void processDrops(XMLOutput xml, List<BuildInfo> buildInfos, File dropsArea) throws Exception
+  protected void processDrops(XMLOutput xml, boolean loadInfoOnly, List<BuildInfo> buildInfos, File dropsArea) throws Exception
   {
     for (File drop : dropsArea.listFiles())
     {
       if (drop.isDirectory() && !new File(drop, MARKER_ARCHIVED).exists())
       {
-        processDrop(xml, drop, buildInfos);
+        processDrop(xml, drop, loadInfoOnly, buildInfos);
       }
     }
   }
 
-  protected void processDrop(XMLOutput xml, File drop, List<BuildInfo> buildInfos) throws Exception
+  protected void processDrop(XMLOutput xml, File drop, boolean loadInfoOnly, List<BuildInfo> buildInfos) throws Exception
   {
+    BuildInfo buildInfo = null;
+
+    File buildInfoFile = new File(drop, "build-info.xml");
+    if (buildInfoFile.isFile())
+    {
+      buildInfo = BuildInfo.read(buildInfoFile);
+      buildInfos.add(buildInfo);
+    }
+
+    if (loadInfoOnly)
+    {
+      return;
+    }
+
     if (IO.isRepository(drop))
     {
       generateCategories(xml, drop);
@@ -88,12 +102,8 @@
       }
     }
 
-    File buildInfoFile = new File(drop, "build-info.xml");
-    if (buildInfoFile.isFile())
+    if (buildInfo != null)
     {
-      BuildInfo buildInfo = BuildInfo.read(buildInfoFile);
-      buildInfos.add(buildInfo);
-
       Properties promotionProperties = Config.loadProperties(new File(drop, DropProcessor.MARKER_PROMOTED), false);
 
       String generateZipSite = promotionProperties.getProperty("generate.zip.site");