3 commits - proxy/installer
by Miroslav Suchý
proxy/installer/configure-proxy.sh | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
New commits:
commit 8d8508e7b1a00128c348a9161f9a234fb5b0cddd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 29 10:22:20 2011 +0200
do not ask for SSL_CNAME if it set in answer file to empty array
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index d46fcb0..cdd0816 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -314,12 +314,15 @@ default_or_input "Country code" SSL_COUNTRY ''
default_or_input "Email" SSL_EMAIL "$TRACEBACK_EMAIL"
if [ ${#SSL_CNAME_PARSED[@]} -eq 0 ]; then
- default_or_input "Cname aliases (separated by space)" SSL_CNAME_ASK ''
- CNAME=($SSL_CNAME_ASK)
- for ALIAS in ${CNAME[@]}; do
- SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS
- done
- check_ca_conf
+ VARIABLE_ISSET=$(set | grep "^SSL_CNAME=")
+ if [ -z $VARIABLE_ISSET ]; then
+ default_or_input "Cname aliases (separated by space)" SSL_CNAME_ASK ''
+ CNAME=($SSL_CNAME_ASK)
+ for ALIAS in ${CNAME[@]}; do
+ SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS
+ done
+ check_ca_conf
+ fi
fi
/usr/bin/rhn-proxy-activate --server="$RHN_PARENT" \
commit 8c08d49f4ea97ae2e9eac7ca806bb8365dd75580
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 29 10:13:49 2011 +0200
local can be used only in functions
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 6134ebf..d46fcb0 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -316,7 +316,6 @@ default_or_input "Email" SSL_EMAIL "$TRACEBACK_EMAIL"
if [ ${#SSL_CNAME_PARSED[@]} -eq 0 ]; then
default_or_input "Cname aliases (separated by space)" SSL_CNAME_ASK ''
CNAME=($SSL_CNAME_ASK)
- local ALIAS
for ALIAS in ${CNAME[@]}; do
SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS
done
commit 90fe9a4a194078a1965c18689b4786da411bb117
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 29 10:13:06 2011 +0200
fail if CA configuration file do not copy extension
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh
index 41d4f8a..6134ebf 100755
--- a/proxy/installer/configure-proxy.sh
+++ b/proxy/installer/configure-proxy.sh
@@ -187,6 +187,23 @@ is_hosted () {
return $?
}
+check_ca_conf () {
+ if ! grep '^[[:space:]]*copy_extensions[[:space:]]*=[[:space:]]*copy' /root/ssl-build/rhn-ca-openssl.cnf >/dev/null \
+ && [ ${#SSL_CNAME_PARSED[@]} -gt 0 ]; then
+ cat <<WARNING
+It seems you tried to use the --set-cname option. On inspection we noticed that the openssl configuration file we use is missing a critically important option. Without this option, not only will multi host SSL certificates not work, but the planet Earth will implode in a massive rip in the time/space continuum. To avoid this failure, we choose to gracefully exit here and request for you to edit the openssl configuration file
+ /root/ssl-build/rhn-ca-openssl.cnf
+and add this line:
+ copy_extensions = copy
+in
+ [ ca ]
+section.
+Then re-run this script again.
+WARNING
+ exit 3
+ fi
+}
+
#do we have yum or up2date?
YUM_OR_UPDATE="up2date -i"
UPGRADE="up2date -u"
@@ -247,6 +264,8 @@ CA_KEYS
exit 1
fi
+check_ca_conf
+
if ! /sbin/runuser nobody -s /bin/sh --command="[ -r $CA_CHAIN ]" ; then
echo Error: File $CA_CHAIN is not readable by nobody user.
exit 1
@@ -301,6 +320,7 @@ if [ ${#SSL_CNAME_PARSED[@]} -eq 0 ]; then
for ALIAS in ${CNAME[@]}; do
SSL_CNAME_PARSED[CNAME_INDEX++]=--set-cname=$ALIAS
done
+ check_ca_conf
fi
/usr/bin/rhn-proxy-activate --server="$RHN_PARENT" \
12 years, 8 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/LoginAction.java | 8 +++++++
java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 11 ++++++++++
java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 3 ++
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 1
java/code/webapp/WEB-INF/struts-config.xml | 1
5 files changed, 24 insertions(+)
New commits:
commit 614b467c7eae6986dae3d51db129d9e416cb4411
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 26 14:43:07 2011 +0200
709724 - bounce to default url for expired POST requests
We need to bounce to default url for expired POST requests since:
1. After user re-logins, we use HTTP redirect to be able to return to previous page
2. Browser uses a GET method for the url provided in redirect
3. The action which we are about to redirect to may not allow GET
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
index 026e26f..cf84218 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginAction.java
@@ -90,6 +90,7 @@ public class LoginAction extends RhnAction {
String username = (String) f.get("username");
String password = (String) f.get("password");
String urlBounce = (String) f.get("url_bounce");
+ String requestMethod = (String) f.get("request_method");
ActionErrors e = new ActionErrors();
User user = loginUser(username, password, request, response, e);
@@ -102,6 +103,13 @@ public class LoginAction extends RhnAction {
}
urlBounce = DEFAULT_URL_BOUNCE;
}
+ if (requestMethod.equals("POST")) {
+ if (log.isDebugEnabled()) {
+ log.debug("2 - POST method used, using default url bounce [" +
+ DEFAULT_URL_BOUNCE + "]");
+ }
+ urlBounce = DEFAULT_URL_BOUNCE;
+ }
if (urlBounce.trim().endsWith("Logout.do")) {
if (log.isDebugEnabled()) {
log.debug(" - handling special case of url_bounce=Logout.do");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
index 48f4978..3eb8db6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
@@ -65,6 +65,7 @@ public class LoginSetupAction extends RhnAction {
// ok handle the case where we're doing the ReLogin page
String urlBounce = (String) request.getAttribute("url_bounce");
+ String requestMethod = (String) request.getAttribute("request_method");
if (!StringUtils.isEmpty(urlBounce)) {
@@ -76,6 +77,16 @@ public class LoginSetupAction extends RhnAction {
f.set("url_bounce", urlBounce);
}
+ if (!StringUtils.isEmpty(requestMethod)) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("request.getAttribute(request_method): " + requestMethod);
+ }
+
+ DynaActionForm f = (DynaActionForm)form;
+ f.set("request_method", requestMethod);
+ }
+
return mapping.findForward("default");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
index dcee959..fa657e3 100644
--- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
+++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java
@@ -122,6 +122,7 @@ public class PxtAuthenticationService extends BaseAuthenticationService {
try {
StringBuffer redirectURI = new StringBuffer(request.getRequestURI());
String params = ServletUtils.requestParamsToQueryString(request);
+ String requestMethod = request.getMethod();
// don't want to put the ? in the url if there are no params
if (!StringUtils.isEmpty(params)) {
redirectURI.append("?");
@@ -135,6 +136,8 @@ public class PxtAuthenticationService extends BaseAuthenticationService {
request.setAttribute("url_bounce", redirectURI.toString());
}
+ request.setAttribute("request_method", requestMethod);
+
RequestDispatcher dispatcher = request.getRequestDispatcher("/ReLogin.do");
dispatcher.forward(request, response);
}
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index bd69089..e8a2070 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -21,6 +21,7 @@
<rhn:csrf />
<%@ include file="/WEB-INF/pages/common/fragments/login_form.jspf" %>
<html:hidden property="url_bounce" />
+ <html:hidden property="request_method" />
</html:form>
</div><!-- end clearBoxBody -->
</div><!-- end clearBoxInner -->
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index be05813..f991165 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -10,6 +10,7 @@
<form-property name="username" type="java.lang.String"/>
<form-property name="password" type="java.lang.String"/>
<form-property name="url_bounce" type="java.lang.String"/>
+ <form-property name="request_method" type="java.lang.String"/>
</form-bean>
<form-bean name="activationKeyForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
12 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.6.30-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.30-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-25 17:53 +0000
Tagging package [spacewalk-java] version [1.6.30-1] in directory [java/].
Changes since spacewalk-backend-1.6.13-1:
Tomas Lestach (2):
699489 - introduce kickstart.keys.update API
Automatic commit of package [spacewalk-java] release [1.6.30-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java | 16 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java | 11 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 29 ++++++++
java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java | 3
java/code/src/com/redhat/rhn/manager/kickstart/crypto/NoSuchCryptoKeyException.java | 33 ++++++++++
java/spacewalk-java.spec | 5 +
rel-eng/packages/spacewalk-java | 2
7 files changed, 97 insertions(+), 2 deletions(-)
---
12 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e400e262c775d3890a226bb42c038c27193b3e46
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 25 19:53:29 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9785321..c07db75 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.29
+Version: 1.6.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -547,6 +547,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 25 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.30-1
+- 699489 - introduce kickstart.keys.update API (tlestach(a)redhat.com)
+
* Wed Aug 24 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.29-1
- 662200 - allow modification of selected channel attributes via API
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e810e0e..c2ac36a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.29-1 java/
+1.6.30-1 java/
12 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java | 16 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java | 11 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 29 ++++++++
java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java | 3
java/code/src/com/redhat/rhn/manager/kickstart/crypto/NoSuchCryptoKeyException.java | 33 ++++++++++
5 files changed, 92 insertions(+)
New commits:
commit fc334dc95b0fcf33916eccd261bb27c97ecfb79d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 25 16:39:46 2011 +0200
699489 - introduce kickstart.keys.update API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java
index b8b3c58..22664ef 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java
@@ -275,6 +275,22 @@ public class BaseHandler implements XmlRpcInvocationHandler {
}
/**
+ * Public helper method to make sure a user has either
+ * an org admin or a config admin role
+ * If not, this will throw a generic Permission exception.
+ * @param user The user to check
+ * @throws PermissionCheckFailureException if user is neither org nor config admin.
+ */
+ public static void ensureOrgOrConfigAdmin(User user)
+ throws PermissionCheckFailureException {
+ if (!user.hasRole(RoleFactory.ORG_ADMIN) &&
+ !user.hasRole(RoleFactory.CONFIG_ADMIN)) {
+ throw new PermissionCheckFailureException(RoleFactory.ORG_ADMIN,
+ RoleFactory.CONFIG_ADMIN);
+ }
+ }
+
+ /**
* Private helper method to make sure a user the given role..
* If not, this will throw a generic Permission exception.
* @param user The user to check
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java
index 388e5fb..f11112f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PermissionCheckFailureException.java
@@ -76,6 +76,17 @@ public class PermissionCheckFailureException extends FaultException {
/**
* Constructor
+ * @param role1 Cause for the exception (bad role)
+ * @param role2 Cause for the exception (bad role)
+ */
+ public PermissionCheckFailureException(Role role1, Role role2) {
+ super(-23, "permissionCheckFailure", "You do not have permissions to " +
+ "perform this action. You need to have at least a " + role1.getName() +
+ " or " + role2.getName() + " role to perform this action");
+ }
+
+ /**
+ * Constructor
* @param ent Cause for the exception (bad org entitlement type)
*/
public PermissionCheckFailureException(OrgEntitlementType ent) {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
index 75e50bc..32ce62c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java
@@ -142,6 +142,35 @@ public class CryptoKeysHandler extends BaseHandler {
}
/**
+ * Updates type and content of the key identified by the description
+ *
+ * @param sessionKey identifies the user that is logged in and performing the call
+ * @param description description of the key used for identification
+ * @param type type of key being created
+ * @param content contents of the key itself
+ * @return 1 if the delete was successful
+ * @throws KickstartKeyDeleteException if there is an error during the delete
+ *
+ * @xmlrpc.doc Updates type and content of the key identified by the description
+ * @xmlrpc.param #param("string", "session_key")
+ * @xmlrpc.param #param("string", "description")
+ * @xmlrpc.param #param_desc("string", "type", "valid values are GPG or SSL")
+ * @xmlrpc.param #param("string", "content")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int update(String sessionKey, String description, String type, String content) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ BaseHandler.ensureOrgOrConfigAdmin(loggedInUser);
+
+ EditCryptoKeyCommand cmd = new EditCryptoKeyCommand(loggedInUser, description);
+ cmd.setType(type);
+ cmd.setContents(content);
+ cmd.store(); // in this case we do not expect any error
+ // because we do not touch description
+ return 1;
+ }
+
+ /**
* Returns all of the data associated with the given key.
*
* @param sessionKey identifies the user that is logged in and performing the call
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java
index 154ab4d..068be67 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/EditCryptoKeyCommand.java
@@ -52,5 +52,8 @@ public class EditCryptoKeyCommand extends BaseCryptoKeyCommand {
}
this.key = KickstartFactory.lookupCryptoKey(description, currentUser.getOrg());
+ if (this.key == null) {
+ throw new NoSuchCryptoKeyException(description);
+ }
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/crypto/NoSuchCryptoKeyException.java b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/NoSuchCryptoKeyException.java
new file mode 100644
index 0000000..0f5090f
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/crypto/NoSuchCryptoKeyException.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.manager.kickstart.crypto;
+
+import com.redhat.rhn.FaultException;
+
+
+/**
+ * NoSuchCryptoKeyException
+ * @version $Rev$
+ */
+public class NoSuchCryptoKeyException extends FaultException {
+
+ /**
+ * Constructor
+ * @param description the key description
+ */
+ public NoSuchCryptoKeyException(String description) {
+ super(1210, "invalidCryptoKey", "Invalid crypto key description: " + description);
+ }
+}
12 years, 8 months
Changes to 'refs/tags/spacewalk-backend-1.6.13-1'
by Michael Mraka
Tag 'spacewalk-backend-1.6.13-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-08-25 09:45 +0000
Tagging package [spacewalk-backend] version [1.6.13-1] in directory [backend/].
Changes since spacewalk-web-1.6.18-1:
Michael Mraka (2):
fixed package lookup
Automatic commit of package [spacewalk-backend] release [1.6.13-1].
---
backend/server/importlib/backend.py | 12 +++++++-----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
---
12 years, 8 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/server/importlib/backend.py | 12 +++++++-----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 5ad729d1506439fa89c94e887c3cd0fd97fb3a20
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 25 11:45:50 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 90cda5f..9fc842e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.12
+Version: 1.6.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -674,6 +674,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Aug 25 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.13-1
+- fixed package lookup
+
* Fri Aug 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.12-1
- 593402 - cobbler-web is known to break our configuration
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 80d2f8b..36d81df 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.12-1 backend/
+1.6.13-1 backend/
commit 0285415f8403d2714b72e3534138fbd92230f6c1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 25 11:34:50 2011 +0200
fixed package lookup
regression caused by 86ec92b1c0221a9bb51e0f032f1800b349972036
fixing
Traceback (most recent call last):
File "/usr/bin/satellite-sync", line 139, in main
return satsync.Runner().main()
...
File "/usr/lib/python2.4/site-packages/spacewalk/server/importlib/backend.py", line 1701, in __lookupObjectCollection
raise InvalidPackageError(object, "Could not find object %s in table %s" % (object, tableName))
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 29e4f0f..dc2a0b8 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -480,19 +480,21 @@ class Backend:
raise TypeError("Expected an IncompletePackage instance, found %s" % \
str(type(package)))
for package in packages:
+ # here we need to figure out which checksum we have in the database
+ not_found = None
for type, chksum in package['checksums'].iteritems():
package['checksum_type'] = type
package['checksum'] = chksum
package['checksum_id'] = checksums[(type, chksum)]
try:
self.__lookupObjectCollection([package], 'rhnPackage')
- exception = None
+ not_found = None
break
except InvalidPackageError, e:
- if ignore_missing:
- pass
- else:
- raise
+ not_found = (e, sys.exc_info()[2])
+ if not_found and not ignore_missing:
+ # package is not in database at all
+ raise not_found[0], None, not_found[1]
def lookupSolarisPackages(self, packages, ignore_missing=0):
for pkg in packages:
12 years, 8 months
Changes to 'refs/tags/spacewalk-web-1.6.18-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.6.18-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-25 09:12 +0000
Tagging package [spacewalk-web] version [1.6.18-1] in directory [web/].
Changes since spacewalk-java-1.6.29-1:
Miroslav Suchý (2):
705363 - spacewalk-base and spacewalk-base-minimal are now disjunctive -> remove the provide from spacewalk-base
Automatic commit of package [spacewalk-web] release [1.6.18-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 8 months
2 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 7c56b8d01312feba208dfdb427baed2f61a6e6ce
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 25 11:12:09 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.18-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 16ba4f6..1ad392b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.17-1 web/
+1.6.18-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2cd9d06..2161eda 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.17
+Version: 1.6.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Aug 25 2011 Miroslav Suchý 1.6.18-1
+- 705363 - spacewalk-base and spacewalk-base-minimal are now disjunctive
+ remove the provide from spacewalk-base
+
* Wed Aug 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.17-1
- fixed typo in sql query
commit 7ec5651ce236f1c4755d64bbeb1cf1275fa21d19
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 25 11:10:57 2011 +0200
705363 - spacewalk-base and spacewalk-base-minimal are now disjunctive -> remove the provide from spacewalk-base
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3d08423..2cd9d06 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -37,7 +37,6 @@ This package contains the HTML files for the Spacewalk web site.
Group: Applications/Internet
Summary: Programs needed to be installed on the RHN Web base classes
Requires: spacewalk-pxt
-Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
Provides: spacewalk(spacewalk-base) = %{version}-%{release}
Requires: webserver
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
12 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.6.29-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.29-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-24 19:30 +0000
Tagging package [spacewalk-java] version [1.6.29-1] in directory [java/].
Changes since spacewalk-certs-tools-1.6.4-1:
Tomas Lestach (2):
662200 - allow modification of selected channel attributes via API
Automatic commit of package [spacewalk-java] release [1.6.29-1].
---
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChecksumLabelException.java | 40 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 83 +++++++++-
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 7
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 46 +++++
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
7 files changed, 178 insertions(+), 10 deletions(-)
---
12 years, 8 months