java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 15 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 14 ++++++++-
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 6 ++--
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 1
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 11 +++++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 2 -
java/code/src/log4j.properties | 4 +-
8 files changed, 45 insertions(+), 12 deletions(-)
New commits:
commit 83444dca49ec80eca85543fa5ccb64fd9dd85120
Author: shughes <shughes(a)scooby.rdu.redhat.com>
Date: Mon Mar 15 16:56:17 2010 -0400
fixes to correct KicktartPackage unique contraints on Hudson builds
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 2f4e2b6..07faee6 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.org.Org;
+import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.token.ActivationKeyFactory;
import com.redhat.rhn.domain.token.Token;
@@ -475,6 +476,20 @@ public class KickstartData {
iter.remove();
}
}
+
+ /**
+ *
+ * @param pName Package name to check if Kickstart Data contains
+ * @return if package name is in this kickstart data
+ */
+ public boolean hasKsPackage(PackageName pName) {
+ for (KickstartPackage pack : ksPackages) {
+ if (pName.equals(pack.getPackageName())) {
+ return true;
+ }
+ }
+ return false;
+ }
/**
* Get the KickstartScript of type "pre"
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index ff688fa..21990ef 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -41,7 +41,7 @@ public class KickstartPackage
/**
* @param ksDataIn identifies kickstart
- * @param packageNameIn PackageName to be assciated
+ * @param packageNameIn PackageName to be associated
*/
public KickstartPackage(KickstartData ksDataIn, PackageName packageNameIn) {
super();
@@ -49,6 +49,18 @@ public class KickstartPackage
this.packageName = packageNameIn;
this.position = 0L;
}
+
+
+ /**
+ * @param ksDataIn identifies kickstart
+ * @param packageNameIn PackageName to be associated
+ * @param posIn position the package Name is in the kickstart package list
+ */
+ public KickstartPackage(KickstartData ksDataIn, PackageName packageNameIn, Long posIn) {
+ this(ksDataIn, packageNameIn);
+ this.position = posIn;
+ }
+
/**
* @return Returns the position.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
index 6d52d73..740e4ef 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java
@@ -211,16 +211,16 @@ public class KickstartBuilder {
}
Set<KickstartPackage> ksPackagesSet = new TreeSet<KickstartPackage>();
-
+ Long pos = new Long(0);
for (Iterator<String> it = lines.iterator(); it.hasNext();) {
String currentLine = (String)it.next();
if (currentLine.startsWith("#") || currentLine.startsWith("%packages") ||
currentLine.equals("")) {
continue;
}
-
+ pos++;
PackageName pn = PackageFactory.lookupOrCreatePackageByName(currentLine);
- ksPackagesSet.add(new KickstartPackage(ksData, pn));
+ ksPackagesSet.add(new KickstartPackage(ksData, pn, pos));
}
ksData.getKsPackages().addAll(ksPackagesSet);
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
index 91b7188..832b101 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java
@@ -329,6 +329,7 @@ public class KickstartBuilderTest extends BaseTestCaseWithUser {
KickstartBuilder builder = new KickstartBuilder(user);
KickstartableTree tree = KickstartableTreeTest.createTestKickstartableTree();
+ //String randomLabel = RandomStringUtils.randomAlphabetic(10);
KickstartData ksData = builder.createFromParser(parser, "mykslabel",
KickstartVirtualizationType.XEN_PARAVIRT, tree, null);
assertEquals(19, ksData.getCommands().size());
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 3954653..4e36694 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -466,8 +466,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k = (KickstartData) TestUtils.saveAndReload(k);
- k.addKsPackage(new KickstartPackage(k, pn));
- k.addKsPackage(new KickstartPackage(k, pn2));
+ k.addKsPackage(new KickstartPackage(k, pn, new Long(0)));
+ k.addKsPackage(new KickstartPackage(k, pn2, new Long(1)));
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index cf25965..67e5283 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -90,9 +90,12 @@ public class SoftwareHandler extends BaseHandler {
KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
Set<KickstartPackage> packages = ksdata.getKsPackages();
packages.clear();
+ KickstartFactory.saveKickstartData(ksdata);
+ Long pos = new Long(packages.size()); // position package in list
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- packages.add(new KickstartPackage(ksdata, pn));
+ pos++;
+ packages.add(new KickstartPackage(ksdata, pn, pos));
}
KickstartFactory.saveKickstartData(ksdata);
return 1;
@@ -121,10 +124,12 @@ public class SoftwareHandler extends BaseHandler {
checkKickstartPerms(user);
KickstartData ksdata = lookupKsData(ksLabel, user.getOrg());
Set<KickstartPackage> packages = ksdata.getKsPackages();
+ Long pos = new Long(packages.size()); // position package in list
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- KickstartPackage kp = new KickstartPackage(ksdata, pn);
- if (!packages.contains(kp)) {
+ pos++;
+ KickstartPackage kp = new KickstartPackage(ksdata, pn, pos);
+ if (!ksdata.hasKsPackage(kp.getPackageName())) {
packages.add(kp);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index 61930ed..f4a007a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -77,7 +77,7 @@ public class SoftwareHandlerTest extends BaseHandlerTestCase {
packages.add("gcc");
int result = handler.appendToSoftwareList(adminKey, ksProfile.getLabel(), packages);
-
+
assertEquals(1, result);
assertEquals(numPackagesInitial + packages.size(),
ksProfile.getKsPackages().size());
diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties
index de268b7..a8fd6b4 100644
--- a/java/code/src/log4j.properties
+++ b/java/code/src/log4j.properties
@@ -35,8 +35,8 @@ log4j.logger.org.hibernate.engine.loading.LoadContexts=ERROR
log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=INFO
#log4j.logger.org.hibernate.SQL=debug,HibernateAppender
#log4j.logger.org.hibernate=debug,HibernateAppender
-#log4j.logger.net.rkbloom.logdriver.LogPreparedStatement=DEBUG
-#log4j.logger.net.rkbloom.logdriver.LogStatement=DEBUG
+log4j.logger.net.rkbloom.logdriver.LogPreparedStatement=DEBUG
+log4j.logger.net.rkbloom.logdriver.LogStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
14 years, 2 months
backend/server
by Justin Sherrill
backend/server/handlers/xmlrpc/queue.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a80cc56ba6dd4cf39a095ab0c747f5530d8be07
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Mar 15 10:09:46 2010 -0400
adding additional ordering to aid in consistency
diff --git a/backend/server/handlers/xmlrpc/queue.py b/backend/server/handlers/xmlrpc/queue.py
index e25cf6d..0a86e07 100644
--- a/backend/server/handlers/xmlrpc/queue.py
+++ b/backend/server/handlers/xmlrpc/queue.py
@@ -205,7 +205,7 @@ class Queue(rhnHandler):
and sap.action_id = a.prerequisite
and sap.status != 2 -- completed
)
- order by a.earliest_action, a.prerequisite nulls first
+ order by a.earliest_action, a.prerequisite nulls first, a.id
""")
14 years, 2 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/Cert.pm | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
New commits:
commit 59f419493df5739b25a9193684a843be4b60bf1d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 15 14:14:54 2010 +0100
529371 - use the OO interface to File::Temp, make it UNLINK.
diff --git a/web/modules/rhn/RHN/Cert.pm b/web/modules/rhn/RHN/Cert.pm
index 58c1cd0..114f46c 100644
--- a/web/modules/rhn/RHN/Cert.pm
+++ b/web/modules/rhn/RHN/Cert.pm
@@ -19,7 +19,7 @@ package RHN::Cert;
use XML::LibXML;
use IO::File;
-use File::Temp;
+use File::Temp ();
use IPC::Open3;
use RHN::Exception qw/throw/;
@@ -159,18 +159,15 @@ sub check_signature {
$self->check_required_fields;
my $data = $self->as_checksum_string;
- my ( $data_fh, $data_file ) = File::Temp::tempfile();
- print $data_fh $data;
- close $data_fh;
+ my $data_file = new File::Temp(UNLINK => 1);
+ print $data_file $data;
+ $data_file->close();
- my ( $sig_fh, $sig_file ) = File::Temp::tempfile();
- print $sig_fh $signature;
- close $sig_fh;
+ my $sig_file = new File::Temp(UNLINK => 1);
+ print $sig_file $signature;
+ $sig_file->close();
- system("gpg --verify -q --keyring $keyring $sig_file $data_file");
-
- unlink $data_file;
- unlink $sig_file;
+ system('gpg', '--verify', '-q', '--keyring', $keyring, $sig_file->filename(), $data_file->filename());
my $retval = $? >> 8;
return ($retval == 0) ? 1 : 0;
@@ -185,13 +182,13 @@ sub compute_signature {
my $data = $self->as_checksum_string;
- my ( $data_fh, $data_file ) = File::Temp::tempfile();
- print $data_fh $data;
- close $data_fh;
+ my $data_file = new File::Temp(UNLINK => 1);
+ print $data_file $data;
+ $data_file->close();
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
qw|gpg -q --batch --yes --passphrase-fd 0 --sign --detach-sign --armor
- -o /dev/stdout --local-user|, $signer, $data_file) or return;
+ -o /dev/stdout --local-user|, $signer, $data_file->filename()) or return;
print $wfh $passphrase;
close $wfh;
@@ -203,7 +200,6 @@ sub compute_signature {
close $rfh;
waitpid $pid, 0;
- unlink $data_file;
return $out;
}
14 years, 2 months
java/code
by Michael Mraka
java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0f1df443f30750a905ba5747637d98ef77d73489
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Sat Mar 13 21:32:36 2010 +0800
Fix syntax highliging in editarea textareas
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf
index 853f0e0..8d45a8c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf
@@ -3,10 +3,10 @@
<script language="javascript" type="text/javascript">
editAreaLoader.init({
id : "contents"
+ ,start_highlight: true
,allow_toggle: true
,allow_resize: "both"
,word_wrap: true
,toolbar: "search, go_to_line, |, undo, redo, |, syntax_selection, |, highlight, reset_highlight, |, help"
});
</script>
-
14 years, 2 months
2 commits - rel-eng/lib
by Miroslav Suchý
rel-eng/lib/spacewalk/releng/builder.py | 39 ++++++++++++++++++--------------
rel-eng/lib/spacewalk/releng/tagger.py | 10 ++++----
2 files changed, 27 insertions(+), 22 deletions(-)
New commits:
commit 8da139a7b75f380cd1af1c1f748ff4c23c67dfa7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Mar 15 11:39:02 2010 +0100
rename self.global_config to self.config as it is merge of global_config and pkg_config
diff --git a/rel-eng/lib/spacewalk/releng/builder.py b/rel-eng/lib/spacewalk/releng/builder.py
index f661fa8..ebfe1e1 100644
--- a/rel-eng/lib/spacewalk/releng/builder.py
+++ b/rel-eng/lib/spacewalk/releng/builder.py
@@ -49,7 +49,7 @@ class Builder(object):
self.build_version = version
self.dist = dist
self.test = test
- self.global_config = global_config
+ self.config = global_config
self.user_config = user_config
self.offline=offline
self.no_cleanup = False
@@ -57,7 +57,7 @@ class Builder(object):
# Override global configurations using local configurations
for section in pkg_config.sections():
for options in pkg_config.options(section):
- self.global_config.set(section, options, pkg_config.get(section, options))
+ self.config.set(section, options, pkg_config.get(section, options))
self.rpmbuild_basedir = build_dir
self.display_version = self._get_display_version()
@@ -103,13 +103,13 @@ class Builder(object):
# Configure CVS variables if possible. Will check later that
# they're actually defined if the user requested CVS work be done.
- if self.global_config.has_section("cvs"):
- if self.global_config.has_option("cvs", "cvsroot"):
- self.cvs_root = self.global_config.get("cvs", "cvsroot")
+ if self.config.has_section("cvs"):
+ if self.config.has_option("cvs", "cvsroot"):
+ self.cvs_root = self.config.get("cvs", "cvsroot")
debug("cvs_root = %s" % self.cvs_root)
- if self.global_config.has_option("cvs", "branches"):
+ if self.config.has_option("cvs", "branches"):
self.cvs_branches = \
- global_config.get("cvs", "branches").split(" ")
+ self.config.get("cvs", "branches").split(" ")
# TODO: if it looks like we need custom CVSROOT's for different users,
# allow setting of a property to lookup in ~/.spacewalk-build-rc to
@@ -264,7 +264,7 @@ class Builder(object):
Lookup autobuild Koji tags from global config, create srpms with
appropriate disttags, and submit builds to Koji.
"""
- autobuild_tags = self.global_config.get("koji", "autobuild_tags")
+ autobuild_tags = self.config.get("koji", "autobuild_tags")
print("Building release in Koji...")
debug("Koji tags: %s" % autobuild_tags)
koji_tags = autobuild_tags.strip().split(" ")
@@ -275,18 +275,18 @@ class Builder(object):
for koji_tag in koji_tags:
# Lookup the disttag configured for this Koji tag:
- disttag = self.global_config.get(koji_tag, "disttag")
- if self.global_config.has_option(koji_tag, "whitelist"):
+ disttag = self.config.get(koji_tag, "disttag")
+ if self.config.has_option(koji_tag, "whitelist"):
# whitelist implies only those packages can be built to the
# tag,regardless if blacklist is also defined.
- if self.project_name not in self.global_config.get(koji_tag,
+ if self.project_name not in self.config.get(koji_tag,
"whitelist").strip().split(" "):
print("WARNING: %s not specified in whitelist for %s" % (
self.project_name, koji_tag))
print(" Package *NOT* submitted to Koji.")
continue
- elif self.global_config.has_option(koji_tag, "blacklist"):
- if self.project_name in self.global_config.get(koji_tag,
+ elif self.config.has_option(koji_tag, "blacklist"):
+ if self.project_name in self.config.get(koji_tag,
"blacklist").strip().split(" "):
print("WARNING: %s specified in blacklist for %s" % (
self.project_name, koji_tag))
@@ -501,15 +501,15 @@ class Builder(object):
"""
Return True if this repo and branch is configured to build in CVS.
"""
- if not self.global_config.has_section("cvs"):
+ if not self.config.has_section("cvs"):
debug("Cannot build from CVS, no 'cvs' section found in global.build.py.props")
return False
- if not self.global_config.has_option("cvs", "cvsroot"):
+ if not self.config.has_option("cvs", "cvsroot"):
debug("Cannot build from CVS, no 'cvsroot' defined in global.build.py.props")
return False
- if not self.global_config.has_option("cvs", "branches"):
+ if not self.config.has_option("cvs", "branches"):
debug("Cannot build from CVS no branches defined in global.build.py.props")
return False
@@ -520,11 +520,11 @@ class Builder(object):
Return True if this repo and branch are configured to auto build in
any Koji tags.
"""
- if not self.global_config.has_section("koji"):
+ if not self.config.has_section("koji"):
debug("No 'koji' section found in global.build.py.props")
return False
- if not self.global_config.has_option("koji", "autobuild_tags"):
+ if not self.config.has_option("koji", "autobuild_tags"):
debug("Cannot build in Koji, no autobuild_tags defined in global.build.py.props")
return False
diff --git a/rel-eng/lib/spacewalk/releng/tagger.py b/rel-eng/lib/spacewalk/releng/tagger.py
index cba5e8d..2bcaffc 100644
--- a/rel-eng/lib/spacewalk/releng/tagger.py
+++ b/rel-eng/lib/spacewalk/releng/tagger.py
@@ -40,7 +40,7 @@ class VersionTagger(object):
def __init__(self, global_config=None, keep_version=False):
self.git_root = find_git_root()
self.rel_eng_dir = os.path.join(self.git_root, "rel-eng")
- self.global_config = global_config
+ self.config = global_config
self.full_project_dir = os.getcwd()
self.spec_file_name = find_spec_file()
@@ -254,8 +254,8 @@ class VersionTagger(object):
suffix = ""
# If global config specifies a tag suffix, use it:
- if self.global_config.has_option("globalconfig", "tag_suffix"):
- suffix = self.global_config.get("globalconfig", "tag_suffix")
+ if self.config.has_option("globalconfig", "tag_suffix"):
+ suffix = self.config.get("globalconfig", "tag_suffix")
new_version_w_suffix = "%s%s" % (new_version, suffix)
# Write out our package metadata:
@@ -342,8 +342,8 @@ class VersionTagger(object):
""" Returns the actual tag we'll be creating. """
suffix = ""
# If global config specifies a tag suffix, use it:
- if self.global_config.has_option("globalconfig", "tag_suffix"):
- suffix = self.global_config.get("globalconfig", "tag_suffix")
+ if self.config.has_option("globalconfig", "tag_suffix"):
+ suffix = self.config.get("globalconfig", "tag_suffix")
return "%s-%s%s" % (self.project_name, new_version, suffix)
commit e443533d5aa9f98d01f3152bd5ebaac3ee0f2e52
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Mar 15 11:34:06 2010 +0100
allow build.py.props to overrides any value in tito.props
diff --git a/rel-eng/lib/spacewalk/releng/builder.py b/rel-eng/lib/spacewalk/releng/builder.py
index 52c773e..f661fa8 100644
--- a/rel-eng/lib/spacewalk/releng/builder.py
+++ b/rel-eng/lib/spacewalk/releng/builder.py
@@ -54,6 +54,11 @@ class Builder(object):
self.offline=offline
self.no_cleanup = False
+ # Override global configurations using local configurations
+ for section in pkg_config.sections():
+ for options in pkg_config.options(section):
+ self.global_config.set(section, options, pkg_config.get(section, options))
+
self.rpmbuild_basedir = build_dir
self.display_version = self._get_display_version()
14 years, 2 months
java/code
by Partha Aji
java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp | 4 -
java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf | 5 +
java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf | 12 ++--
java/code/webapp/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf | 8 ++
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 29 ++--------
java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 3 -
java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 4 -
7 files changed, 29 insertions(+), 36 deletions(-)
New commits:
commit bb6d939005e8fcc95111b0456096ae966c7b70c6
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Mar 12 19:05:49 2010 -0500
510383 - Fixes on the UI side for password length issue
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
index a00090c..62b4bbd 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
@@ -6,7 +6,7 @@
<html>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %>
-
+<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<rhn:toolbar base="h2" helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active">
<bean:message key="yourchangeemail.jsp.title" />
</rhn:toolbar>
@@ -15,7 +15,7 @@
${pageinstructions}
</p>
<html:form action="/users/ChangeEmailSubmit.do?uid=${param.uid}">
- <html:text property="email" size="32" />
+ <html:text property="email" size="32" maxlength="${emailLength}" />
<html:submit value="${button_label}" />
<html:hidden property="uid"/>
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf
index cc86647..53fbb52 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/login_form.jspf
@@ -1,11 +1,12 @@
+<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<div class="formrow">
<span class="label"><bean:message key="login.jsp.redhatlogin"/></span>
- <span class="formfield"><html:text tabindex="2" property="username" size="10" maxlength="64"/></span>
+ <span class="formfield"><html:text tabindex="2" property="username" size="10" maxlength="${loginLength}"/></span>
</div>
<div class="formrow">
<span class="label"><bean:message key="login.jsp.password"/></span>
- <span class="formfield"><html:password tabindex="2" property="password" size="10" value="" maxlength="32" /></span>
+ <span class="formfield"><html:password tabindex="2" property="password" size="10" value="" maxlength="${passwordLength}" /></span>
</div>
<div class="formrow">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
index b9437da..9deec21 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
@@ -1,3 +1,5 @@
+<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
+
<tr>
<th><bean:message key="username.displayname"/></th>
<td><c:out escapeXml="true" value="${user.login}" /></td>
@@ -17,19 +19,19 @@
<tr>
<th><bean:message key="firstNames.displayname"/></th>
<td>
- <html:text property="firstNames" size="20" maxlength="20"/>
+ <html:text property="firstNames" size="20" maxlength="${firstNameLength}"/>
</td>
</tr>
<tr>
<th><bean:message key="lastName.displayname"/></th>
<td>
- <html:text property="lastName" size="20" maxlength="20"/>
+ <html:text property="lastName" size="20" maxlength="${lastNameLength}"/>
</td>
</tr>
<tr>
<th><bean:message key="position.displayname"/></th>
<td>
- <html:text property="title" size="30" maxlength="30"/>
+ <html:text property="title" size="30" maxlength="${titleLength}"/>
</td>
</tr>
<rhn:require acl="user_role(org_admin)">
@@ -43,13 +45,13 @@
<tr>
<th><bean:message key="password.displayname"/></th>
<td>
- <html:password property="desiredpassword" size="20" maxlength="20"/>
+ <html:password property="desiredpassword" size="20" maxlength="${passwordLength}"/>
</td>
</tr>
<tr>
<th><bean:message key="confirmpass.displayname"/></th>
<td>
- <html:password property="desiredpasswordConfirm" size="20" maxlength="20"/>
+ <html:password property="desiredpasswordConfirm" size="20" maxlength="${passwordLength}"/>
</td>
</tr>
<tr>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf
new file mode 100644
index 0000000..411bd7f
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf
@@ -0,0 +1,8 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+ <c:set var="loginLength" value="${rhn:getConfig('max_user_len')}"/>
+ <c:set var="firstNameLength" value="128"/>
+ <c:set var="lastNameLength" value="128"/>
+ <c:set var="passwordLength" value="${rhn:getConfig('max_passwd_len')}"/>
+ <c:set var="emailLength" value="${rhn:getConfig('max_email_len')}"/>
+ <c:set var="titleLength" value="128"/>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index f3dde13..41a0dc3 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -7,6 +7,7 @@
<body>
<script language="javascript" src="/javascript/display.js"></script>
+<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<!-- Setup the account_type variable, which is used throughout this page -->
<c:if test="${empty param.account_type}">
@@ -38,21 +39,21 @@
<tr>
<th><rhn:required-field key="desiredlogin"/>:</th>
<td>
- <html:text property="login" size="15" maxlength="45"/>
+ <html:text property="login" size="15" maxlength="${loginLength}"/>
</td>
</tr>
<tr>
<th><bean:message key="desiredpass" />
<span name="password-asterisk" class="required-form-field">*</span>:</th>
<td>
- <html:password property="desiredpassword" size="15" maxlength="32"/>
+ <html:password property="desiredpassword" size="15" maxlength="${passwordLength}"/>
</td>
</tr>
<tr>
<th><bean:message key="confirmpass" />
<span name="password-asterisk" class="required-form-field">*</span>:</th>
<td>
- <html:password property="desiredpasswordConfirm" size="15" maxlength="32"/>
+ <html:password property="desiredpasswordConfirm" size="15" maxlength="${passwordLength}"/>
</td>
</tr>
<c:if test="${displaypam == 'true' && account_type != 'create_sat'}">
@@ -87,33 +88,17 @@
labelProperty="label" />
</html:select>
- <html:text property="firstNames" size="15" maxlength="40"/>
- <html:text property="lastName" size="15" maxlength="40"/>
+ <html:text property="firstNames" size="15" maxlength="${firstNameLength}"/>
+ <html:text property="lastName" size="15" maxlength="${lastNameLength}"/>
</td>
</tr>
<tr>
<th><rhn:required-field key="email"/>:</th>
<td>
- <html:text property="email" size="20" />
+ <html:text property="email" size="20" maxlength="${emailLength}"/>
</td>
</tr>
-<c:if test="${account_type == 'create_corporate'}" >
- <tr>
- <th><rhn:required-field key="userdetails.jsp.company"/>:
- </th>
- <td>
- <html:text property="company" size="15" maxlength="100"/>
- </td>
- </tr>
-
- <tr>
- <th><bean:message key="userdetails.jsp.position" />:</th>
- <td>
- <html:text property="title" size="15" maxlength="100"/>
- </td>
- </tr>
-</c:if>
<html:hidden property="account_type" value="${account_type}" />
<tr>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
index c3331cc..a2969ed 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<html:xhtml/>
<html>
<body>
@@ -15,7 +16,7 @@
${pageinstructions}
</p>
<html:form action="/account/ChangeEmailSubmit">
- <html:text property="email" size="32" />
+ <html:text property="email" size="32" maxlength="${emailLength}" />
<html:submit value="${button_label}" />
</html:form>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
index b37781a..ab9876c 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
@@ -24,10 +24,6 @@
<html:form action="/account/UserDetailsSubmit">
<table class="details" align="center">
- <tr>
- <th><bean:message key="companyname.displayname"/></th>
- <td>${user.company}</td>
- </tr>
<%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%>
<tr>
14 years, 2 months
backend/server
by Justin Sherrill
backend/server/importlib/mpmSource.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 006c2b2a9b9db432556e946d57272ad51a3fa4c7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Mar 12 18:27:54 2010 -0500
573140 - fixing error when pushing solaris packages with duplicate requires
diff --git a/backend/server/importlib/mpmSource.py b/backend/server/importlib/mpmSource.py
index f6ea4b8..a7224b9 100644
--- a/backend/server/importlib/mpmSource.py
+++ b/backend/server/importlib/mpmSource.py
@@ -126,12 +126,22 @@ class mpmBinaryPackage(headerSource.rpmBinaryPackage):
'conflicts' : headerSource.rpmConflicts,
'obsoletes' : headerSource.rpmObsoletes,
}
+
for k, dclass in mapping.items():
+ unique_deps = []
l = []
for dinfo in header.get(k, []):
- finst = dclass()
- finst.populate(dinfo)
- l.append(finst)
+ hash = dinfo
+ if not len(hash['name']):
+ continue
+ dep_nv = (hash['name'], hash['version'], hash['flags'])
+ if dep_nv not in unique_deps:
+ unique_deps.append(dep_nv)
+ finst = dclass()
+ finst.populate(dinfo)
+ l.append(finst)
+ else:
+ continue
self[k] = l
def _populateChangeLog(self, header):
14 years, 2 months
Changes to 'refs/tags/spacewalk-backend-0.8.48-1'
by Justin Sherrill
Tag 'spacewalk-backend-0.8.48-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-03-12 20:35 +0000
Tagging package [spacewalk-backend] version [0.8.48-1] in directory [backend/].
Changes since spacewalk-schema-0.8.15-1:
Justin Sherrill (3):
fixing import
fixing cfg issue with rhn_mpm.py
Automatic commit of package [spacewalk-backend] release [0.8.48-1].
Michael Mraka (4):
571365 - compute checksum from payload not from package
571365 - defined checksum type we use for mpm packages
571365 - solaris packages don't contain an internal checksum
let mpm_checksum_type be a constant for now
---
backend/server/handlers/app/packages.py | 2 -
backend/server/importlib/headerSource.py | 2 -
backend/server/importlib/packageImport.py | 4 ---
backend/spacewalk-backend.spec | 13 +++++++++-
backend/spacewalk/common/rhn_mpm.py | 5 +++
backend/upload_server/handlers/package_push/package_push.py | 2 -
backend/upload_server/handlers/package_upload/package_upload.py | 2 -
rel-eng/packages/spacewalk-backend | 2 -
8 files changed, 22 insertions(+), 10 deletions(-)
---
14 years, 2 months
Branch 'SPACEWALK-0.8' - backend/spacewalk-backend.spec rel-eng/packages
by Justin Sherrill
backend/spacewalk-backend.spec | 13 ++++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 6da8e99d2ba64ae33eb3b069c74096a179a53fdf
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Mar 12 15:35:48 2010 -0500
Automatic commit of package [spacewalk-backend] release [0.8.48-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 888d29b..428398b 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.47
+Version: 0.8.48
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -621,6 +621,17 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Mar 12 2010 Justin Sherrill <jsherril(a)redhat.com> 0.8.48-1
+- let mpm_checksum_type be a constant for now (michael.mraka(a)redhat.com)
+- fixing cfg issue with rhn_mpm.py (jsherril(a)redhat.com)
+- fixing import (jsherril(a)redhat.com)
+- 571365 - solaris packages don't contain an internal checksum
+ (michael.mraka(a)redhat.com)
+- 571365 - defined checksum type we use for mpm packages
+ (michael.mraka(a)redhat.com)
+- 571365 - compute checksum from payload not from package
+ (michael.mraka(a)redhat.com)
+
* Mon Feb 22 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.47-1
- fixed proxy issue caused by move to mod_wsgi
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ea06d9d..40e4c3e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.47-1 backend/
+0.8.48-1 backend/
14 years, 2 months
Branch 'SPACEWALK-0.8' - 6 commits - backend/server backend/spacewalk backend/upload_server
by Justin Sherrill
backend/server/handlers/app/packages.py | 2 +-
backend/server/importlib/headerSource.py | 2 +-
backend/server/importlib/packageImport.py | 4 ----
backend/spacewalk/common/rhn_mpm.py | 5 +++++
backend/upload_server/handlers/package_push/package_push.py | 2 +-
backend/upload_server/handlers/package_upload/package_upload.py | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit cc116ada05c540d07bef6c3888d7b9dbe717790c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 12 14:14:07 2010 +0100
let mpm_checksum_type be a constant for now
well, this really should be a config option but the trouble is this lib
is shared between server and client and there is no shared config file
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index b109ce6..8a5c3fa 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -131,5 +131,3 @@ repomd_path_prefix = rhn/repodata
# Default to not using taskomatic for repomd
use_taskomatic_repomd = 1
-# default checksums
-mpm_checksum_type = sha256
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index af9cb8a..7868a79 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,11 +22,8 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
-from common import initCFG
-from common.rhnConfig import CFG
-initCFG('server')
-MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
+MPM_CHECKSUM_TYPE = 'md5' # FIXME: this should be a configuration option
def labelCompare(l1, l2):
try:
commit cfd18d96280d4728b757fffea6ab739f88c95a82
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 12:27:56 2010 -0500
fixing cfg issue with rhn_mpm.py
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index ed65a7e..af9cb8a 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,8 +22,10 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
+from common import initCFG
from common.rhnConfig import CFG
+initCFG('server')
MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
def labelCompare(l1, l2):
commit 41a095af9d3955446e391b9db1af89005770f4f3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 11 11:56:40 2010 -0500
fixing import
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index 2920a1b..ed65a7e 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,7 +22,7 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
-from rhnConfig import CFG
+from common.rhnConfig import CFG
MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
commit 73e91840627f186b9d4746c978377bcca0445a9a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 10 14:28:25 2010 +0100
571365 - solaris packages don't contain an internal checksum
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 492cc25..393a899 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -397,12 +397,10 @@ class PackageImport(ChannelPackageSubscription):
pkgDict['evr'] = evr
evrs[evr] = None
- checksums[(pkgDict['checksum_type'], pkgDict['checksum'])] = None
names[pkgDict['name']] = None
archs[pkgDict['arch']] = None
self.backend.lookupEVRs(evrs)
- self.backend.lookupChecksums(checksums)
self.backend.lookupPackageNames(names)
self.backend.lookupPackageArches(archs)
@@ -446,11 +444,9 @@ class PackageImport(ChannelPackageSubscription):
patchDict['evr'] = evr
evrs[evr] = None
- checksums[(patchDict['checksum_type'], patchDict['checksum'])] = None
names[patchDict['name']] = None
self.backend.lookupEVRs(evrs)
- self.backend.lookupChecksums(self.checksums)
self.backend.lookupPackageNames(names)
nevras = {}
commit 0565805b0a28fbb570b0e3f223eb56a6210a8241
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 9 17:07:06 2010 +0100
571365 - defined checksum type we use for mpm packages
diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf
index 8a5c3fa..b109ce6 100644
--- a/backend/rhn-conf/rhn_server.conf
+++ b/backend/rhn-conf/rhn_server.conf
@@ -131,3 +131,5 @@ repomd_path_prefix = rhn/repodata
# Default to not using taskomatic for repomd
use_taskomatic_repomd = 1
+# default checksums
+mpm_checksum_type = sha256
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index 23b0f74..2920a1b 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -22,6 +22,9 @@ from rhn.rpclib import xmlrpclib
import struct
from types import ListType, TupleType, DictType
+from rhnConfig import CFG
+
+MPM_CHECKSUM_TYPE = CFG.MPM_CHECKSUM_TYPE
def labelCompare(l1, l2):
try:
@@ -108,6 +111,9 @@ class MPM_Header:
def is_signed(self):
return 0
+ def checksum_type(self):
+ return MPM_CHECKSUM_TYPE
+
class InvalidPackageError(Exception):
pass
commit e6299d5e7048d00c10fc9d28cebea483fdfc62b8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 9 15:01:11 2010 +0100
571365 - compute checksum from payload not from package
well, in rpm world package = payload but for mpm payload = zip_file_inside
fixed regression from:
commit 1e0dfb3d27f9c821e2418ff5c36be460193d623d
moved getFileMD5 outside of rhnPackageUpload.load_package
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index 2f3ba6f..a59d0ae 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -290,7 +290,7 @@ class Packages(RPC_Base):
header, org_id=org_id)
checksum_type = header.checksum_type()
- checksum = getFileChecksum(header.checksum_type(), file=package_stream)
+ checksum = getFileChecksum(header.checksum_type(), file=payload_stream)
package_dict, diff_level = rhnPackageUpload.push_package(
header, payload_stream, checksum_type, checksum, org_id=org_id, force=force,
header_start=header_start, header_end=header_end,
diff --git a/backend/server/importlib/headerSource.py b/backend/server/importlib/headerSource.py
index ce4f71c..d88a182 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -108,7 +108,7 @@ class rpmPackage(IncompletePackage):
# Strip trailing slashes
path = "%s/%s" % (sanitizePath(relpath), os.path.basename(f_path))
checksum_type = header.checksum_type()
- checksum = getFileChecksum(header.checksum_type(), file=f_obj)
+ checksum = getFileChecksum(header.checksum_type(), file=payload_stream)
self.populate(header, size, checksum_type, checksum, path, org_id,
header_start, header_end, channels)
diff --git a/backend/upload_server/handlers/package_push/package_push.py b/backend/upload_server/handlers/package_push/package_push.py
index 07e265a..e9b8269 100644
--- a/backend/upload_server/handlers/package_push/package_push.py
+++ b/backend/upload_server/handlers/package_push/package_push.py
@@ -116,7 +116,7 @@ class PackagePush(basePackageUpload.BasePackageUpload):
# Sanity check - removed, the package path can no longer be determined
# without the header
checksum_type = header.checksum_type()
- checksum = getFileChecksum(checksum_type, file=temp_stream)
+ checksum = getFileChecksum(checksum_type, file=payload_stream)
self.rel_package_path = rhnPackageUpload.relative_path_from_header(
header, org_id=self.org_id, checksum_type=checksum_type, checksum=checksum)
self.package_path = os.path.join(CFG.MOUNT_POINT,
diff --git a/backend/upload_server/handlers/package_upload/package_upload.py b/backend/upload_server/handlers/package_upload/package_upload.py
index 8736c64..be7dd5d 100644
--- a/backend/upload_server/handlers/package_upload/package_upload.py
+++ b/backend/upload_server/handlers/package_upload/package_upload.py
@@ -75,7 +75,7 @@ class PackageUpload(basePackageUpload.BasePackageUpload):
header, payload_stream, header_start, header_end = \
rhnPackageUpload.load_package(temp_stream)
checksum_type = header.checksum_type()
- checksum = getFileChecksum(checksum_type, file=temp_stream)
+ checksum = getFileChecksum(checksum_type, file=payload_stream)
temp_stream.close()
if not (self.file_checksum_type == checksum_type
14 years, 2 months