java/code/src/com/redhat/rhn/domain/common/Checksum.java |
2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java |
2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java |
17 +++++-----
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java |
3 +
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit b6dd3f18b04e07bdcc3580cfdba5800f2020c67f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 18 14:18:49 2009 +0100
modifying Checksum.toString() for easier debugging
+ checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
index fdbed65..9d8ca14 100644
--- a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
@@ -94,6 +94,6 @@ public class Checksum extends BaseDomainHelper {
/** {@inheritDoc} */
public String toString() {
- return checksum;
+ return checksumType + ":" + checksum;
}
}
diff --git
a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
index 1055480..aa1319d 100644
---
a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
+++
b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
@@ -40,7 +40,7 @@ public class CompressingDigestOutputWriter extends OutputStream
implements
/**
*
* @param stream The stream to compress
- * @param checksumtype checksum type
+ * @param checksumAlgo checksum algorithm
*/
public CompressingDigestOutputWriter(OutputStream stream, String checksumAlgo) {
try {
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index dab4af4..f896942 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -109,18 +109,19 @@ public class RepositoryWriter {
log.info("Checksum Type Value" + this.checksumtype);
// available digests: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
- String checksum_algo = this.checksumtype;
- if (checksum_algo.toUpperCase().startsWith("SHA")) {
- checksum_algo = this.checksumtype.substring(0, 3) + "-" +
this.checksumtype.substring(3);
+ String checksumAlgo = this.checksumtype;
+ if (checksumAlgo.toUpperCase().startsWith("SHA")) {
+ checksumAlgo = this.checksumtype.substring(0, 3) + "-" +
+ this.checksumtype.substring(3);
}
try {
primaryFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + PRIMARY_FILE), checksum_algo);
+ new FileOutputStream(prefix + PRIMARY_FILE), checksumAlgo);
filelistsFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + FILELISTS_FILE), checksum_algo);
+ new FileOutputStream(prefix + FILELISTS_FILE), checksumAlgo);
otherFile = new CompressingDigestOutputWriter(new FileOutputStream(
- prefix + OTHER_FILE), checksum_algo);
+ prefix + OTHER_FILE), checksumAlgo);
}
catch (IOException e) {
throw new RepomdRuntimeException(e);
@@ -187,9 +188,9 @@ public class RepositoryWriter {
'"');
log.info("Checksum Type Value for generate updateinfo" +
this.checksumtype);
RepomdIndexData updateinfoData = generateUpdateinfo(channel, prefix,
- checksum_algo);
+ checksumAlgo);
- RepomdIndexData groupsData = loadCompsFile(channel, checksum_algo);
+ RepomdIndexData groupsData = loadCompsFile(channel, checksumAlgo);
//Set the type so yum can read and perform checksum
primaryData.setType(this.checksumtype);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
index 966720e..cf11c47 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
@@ -179,7 +179,8 @@ public class UpdateInfoWriter extends RepomdWriter {
pkg.getFilename()));
attr.clear();
- attr.addAttribute("type", sanitize(pkgId,
pkg.getChecksum().getChecksumType().getLabel()));
+ attr.addAttribute("type",
+ sanitize(pkgId, pkg.getChecksum().getChecksumType().getLabel()));
handler.startElement("sum", attr);
handler.addCharacters(sanitize(pkgId, pkg.getChecksum().getChecksum()));
handler.endElement("sum");
Show replies by date