try to download compressed ubuntu usn database

uyuni-project · Nov 16, 2023 · 34a26b6 · 34a26b6
1 parent cf3efeb
commit 34a26b6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java b/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java
@@ -41,6 +41,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;
@@ -116,22 +117,40 @@ private static Optional<String> archToPackageArchLabel(String arch) {
 
     private static Map<String, UbuntuErrataInfo> downloadUbuntuErrataInfo(String jsonDBUrl) throws IOException {
         HttpClientAdapter httpClient = new HttpClientAdapter();
-        HttpGet httpGet = new HttpGet(jsonDBUrl);
+        String bzipJsonDBUrl = jsonDBUrl + ".bz2";
+        HttpGet httpGet = new HttpGet(bzipJsonDBUrl);
         LOG.info("download ubuntu errata start");
         HttpResponse httpResponse = httpClient.executeRequest(httpGet);
         int statusCode = httpResponse.getStatusLine().getStatusCode();
         if (statusCode == HttpStatus.SC_OK) {
             try (
                 InputStream responseStream = httpResponse.getEntity().getContent();
-                Reader responseReader = new InputStreamReader(responseStream);
+                BZip2CompressorInputStream bzIn = new BZip2CompressorInputStream(responseStream);
+                Reader responseReader = new InputStreamReader(bzIn);
             ) {
                 Map<String, UbuntuErrataInfo> errataInfo = GSON.fromJson(responseReader, ERRATA_INFO_TYPE);
                 LOG.info("download ubuntu errata end");
                 return errataInfo;
             }
         }
         else {
-            throw new IOException("error downloading " + jsonDBUrl + " status code " + statusCode);
+            LOG.info("Failed to get bzip2 DB - try plain DB");
+            httpGet = new HttpGet(jsonDBUrl);
+            httpResponse = httpClient.executeRequest(httpGet);
+            statusCode = httpResponse.getStatusLine().getStatusCode();
+            if (statusCode == HttpStatus.SC_OK) {
+                try (
+                        InputStream responseStream = httpResponse.getEntity().getContent();
+                        Reader responseReader = new InputStreamReader(responseStream);
+                ) {
+                    Map<String, UbuntuErrataInfo> errataInfo = GSON.fromJson(responseReader, ERRATA_INFO_TYPE);
+                    LOG.info("download ubuntu errata end");
+                    return errataInfo;
+                }
+            }
+            else {
+                throw new IOException("error downloading " + jsonDBUrl + " status code " + statusCode);
+            }
         }
     }
 

diff --git a/java/spacewalk-java.changes.mc.ubuntu-errata-compressed-db b/java/spacewalk-java.changes.mc.ubuntu-errata-compressed-db
@@ -0,0 +1 @@
+- try to download compressed ubuntu usn database