Hi all Attached are patch files to address BZ#559693 which requested the md5sum be displayed by the channel.software.listAllPackages API call. My testing showed that it works with md5 and sha256 packages.
Comments/criticisms welcome. CC -- RHCE#805007969328369
From 5c09d2d138fc32f82e5f6c9491da89d887c9725a Mon Sep 17 00:00:00 2001 From: Colin Coe <[email protected]> Date: Fri, 19 Mar 2010 21:01:57 +0800 Subject: [PATCH] BZ 559693 - allow channel.software.listAllPackages to return the checksum --- .../common/db/datasource/xml/Package_queries.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 1fbb01a..06988cf 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -1259,14 +1259,16 @@ SELECT P.id AS id, NVL(PE.release, ' ') as release, NVL(PE.epoch, ' ') as epoch, PA.label AS arch_label, - TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified + TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified, + C.checksum FROM rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P, - rhnChannelPackage CP + rhnChannelPackage CP, rhnChecksum C WHERE CP.channel_id = :cid AND CP.package_id = P.id AND P.name_id = PN.id AND P.evr_id = PE.id AND PA.id = P.package_arch_id + AND P.checksum_id = C.id ORDER BY UPPER(name) </query> </mode> -- 1.5.5.6
From af2e1befad4a274a6fb4b899c7a34068e9faa754 Mon Sep 17 00:00:00 2001 From: Colin Coe <[email protected]> Date: Tue, 23 Mar 2010 20:25:47 +0800 Subject: [PATCH] BZ 559693 - allow channel.software.listAllPackages, take 2 --- .../xmlrpc/serializer/PackageDtoSerializer.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java index eeb2af7..509eecb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java @@ -66,6 +66,7 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer { epoch = ""; } helper.add("epoch", epoch == null ? "" : epoch); + helper.add("checksum", pack.getChecksum()); helper.add("id", pack.getId()); helper.add("arch_label", pack.getArchLabel()); helper.add("last_modified_date", pack.getLastModified()); -- 1.5.5.6
From cb6c827ce33247a40e91145596897a7912d80181 Mon Sep 17 00:00:00 2001 From: Colin Coe <[email protected]> Date: Wed, 24 Mar 2010 20:59:34 +0800 Subject: [PATCH] BZ 559693 - display checksum type --- .../common/db/datasource/xml/Package_queries.xml | 7 ++++--- .../com/redhat/rhn/frontend/dto/PackageDto.java | 2 +- .../xmlrpc/serializer/PackageDtoSerializer.java | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 06988cf..03f14db 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -1260,15 +1260,16 @@ SELECT P.id AS id, NVL(PE.epoch, ' ') as epoch, PA.label AS arch_label, TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified, - C.checksum + CV.checksum as checksum, + CV.checksum_type as checksum_type FROM rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P, - rhnChannelPackage CP, rhnChecksum C + rhnChannelPackage CP, rhnChecksumView CV WHERE CP.channel_id = :cid AND CP.package_id = P.id AND P.name_id = PN.id AND P.evr_id = PE.id AND PA.id = P.package_arch_id - AND P.checksum_id = C.id + AND P.checksum_id = CV.id ORDER BY UPPER(name) </query> </mode> diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java index 9f4510a..0e00dc5 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java @@ -213,7 +213,7 @@ public class PackageDto extends BaseDto { * * @param checksumTypeIn The checksumtype to set */ - public void setChecksumtype(String checksumTypeIn) { + public void setChecksumType(String checksumTypeIn) { this.checksumType = checksumTypeIn; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java index 509eecb..d557198 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java @@ -67,6 +67,7 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer { } helper.add("epoch", epoch == null ? "" : epoch); helper.add("checksum", pack.getChecksum()); + helper.add("checksum_type", pack.getChecksumType()); helper.add("id", pack.getId()); helper.add("arch_label", pack.getArchLabel()); helper.add("last_modified_date", pack.getLastModified()); -- 1.5.5.6
_______________________________________________ Spacewalk-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/spacewalk-devel
