java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8b9ef87b1c9c951ee51916d018bec0f102c5b673
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Mar 19 17:26:05 2010 -0400
529359 - attempting to fix issue where solaris packages couldnt be installed, may break unit test, we will see
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 98cbf5f..c4f0e3c 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1330,7 +1330,7 @@ public class ActionManager extends BaseManager {
Action action = createScheduledAction(scheduler, type, name, earliestAction);
ActionFactory.save(action);
ActionFactory.getSession().flush();
- ActionFactory.getSession().refresh(action);
+ //ActionFactory.getSession().refresh(action);
Map params = new HashMap();
14 years, 3 months
client/rhel
by Milan Zazrivec
client/rhel/rhnlib/rhn/rpclib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e5c8c48ef19e525b691da1add734fe9411586bb3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Mar 19 21:56:13 2010 +0100
575259 - properly set protocol type
Otherwise rhn-client-tools utilities would fall back to
HTTP when in fact HTTPS was specified in up2date conf. file.
diff --git a/client/rhel/rhnlib/rhn/rpclib.py b/client/rhel/rhnlib/rhn/rpclib.py
index 57f24a4..3379552 100644
--- a/client/rhel/rhnlib/rhn/rpclib.py
+++ b/client/rhel/rhnlib/rhn/rpclib.py
@@ -169,7 +169,7 @@ class Server:
if transport is None:
self._allow_redirect = 1
- transport = self.default_transport(type, proxy, username, password)
+ transport = self.default_transport(self._type, proxy, username, password)
else:
#
# dont allow redirect on unknow transports, that should be
14 years, 3 months
Changes to 'refs/tags/rhnsd-4.9.3-1'
by Jan Pazdziora
Tag 'rhnsd-4.9.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-03-19 18:19 +0000
Tagging package [rhnsd] version [4.9.3-1] in directory [client/rhel/rhnsd/].
Changes since spacewalk-0.9.1-1:
Jan Pazdziora (1):
Automatic commit of package [rhnsd] release [4.9.3-1].
Partha Aji (1):
529359 - Fix for this error
---
client/rhel/rhnsd/rhnsd.spec | 5
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java | 32 +++++
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java | 17 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 61 +++++++---
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 22 +++
java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 13 +-
java/code/webapp/WEB-INF/struts-config.xml | 13 +-
rel-eng/packages/rhnsd | 2
8 files changed, 136 insertions(+), 29 deletions(-)
---
14 years, 3 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhnsd/rhnsd.spec | 5 ++++-
rel-eng/packages/rhnsd | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f5bc67e5c8951bd70b7afbb73c85a66e0efc5797
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 19 19:19:34 2010 +0100
Automatic commit of package [rhnsd] release [4.9.3-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index 9197bad..8682cfd 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhnsd
-Version: 4.9.2
+Version: 4.9.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,9 @@ rm -fr $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Mar 19 2010 Jan Pazdziora 4.9.3-1
+- Check return value of regcomp, fix a memory leak (Joshua Roys)
+
* Wed Feb 10 2010 Miroslav Suchý <msuchy(a)redhat.com> 4.9.2-1
- Pass version define to the compiler (Jan Pazdziora)
- 533895 - if init script is run user return code 4
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd
index 73e5e1b..b3dd489 100644
--- a/rel-eng/packages/rhnsd
+++ b/rel-eng/packages/rhnsd
@@ -1 +1 @@
-4.9.2-1 client/rhel/rhnsd/
+4.9.3-1 client/rhel/rhnsd/
14 years, 3 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java | 32 +++++
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java | 17 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 61 +++++++---
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 22 +++
java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 13 +-
java/code/webapp/WEB-INF/struts-config.xml | 13 +-
6 files changed, 131 insertions(+), 27 deletions(-)
New commits:
commit 11d3e2272b3288501dd52c611b96154a9d26c122
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Mar 19 13:33:01 2010 -0400
529359 - Fix for this error
Reverted and old commit that was added to resolve bz
499508, where the functionality was wrongly removed ..
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
index b659bab..3b436a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
@@ -72,12 +72,17 @@ public abstract class BaseSystemPackagesConfirmAction extends RhnAction {
if (requestContext.wasDispatched("installconfirm.jsp.confirm")) {
return executePackageAction(mapping, formIn, request, response);
}
+ else if (!StringUtils.isBlank(getRemoteMode())) {
+ return runRemoteCommand(mapping, formIn, request, response);
+ }
}
List<PackageListItem> items = getDataResult(request);
Server server = requestContext.lookupAndBindServer();
+ request.setAttribute("mode", getRemoteMode());
+
/*
* If we are removing a package that is not in a channel the server is
* subscribed to, then the rollback will not work, lets give the user
@@ -135,6 +140,33 @@ public abstract class BaseSystemPackagesConfirmAction extends RhnAction {
return items;
}
+
+
+ /**
+ * Runs remote packages
+ * @param mapping ActionMapping
+ * @param formIn ActionForm
+ * @param request ServletRequest
+ * @param response ServletResponse
+ * @return The ActionForward to go to next.
+ */
+ public ActionForward runRemoteCommand(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ RequestContext requestContext = new RequestContext(request);
+ Long sid = requestContext.getRequiredParam("sid");
+ Map params = new HashMap();
+ params.put("session_set_label", getDecl(sid));
+ params.put("sid", sid.toString());
+ params.put("mode", getRemoteMode());
+
+ getStrutsDelegate().rememberDatePicker(params,
+ (DynaActionForm)formIn, "date", DatePicker.YEAR_RANGE_POSITIVE);
+ return getStrutsDelegate().forwardParams(mapping.findForward("remotecmd"), params);
+ }
+
/**
* Executes the appropriate PackageAction
* @param mapping ActionMapping
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
index 2f7caae..3a29a35 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
@@ -111,14 +111,14 @@ public class ScheduleRemoteCommand extends RhnAction {
}
}
- private void showRemoteCommandMsg(ActionMessages msgs, boolean before) {
+ private void showRemoteCommandMsg(ActionMessages msgs, boolean before, String mode) {
if (before) {
msgs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("message.remotecommandbefore"));
+ new ActionMessage("message.remotecommandbefore." + mode));
}
else {
msgs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("message.remotecommandafter"));
+ new ActionMessage("message.remotecommandafter." + mode));
}
}
@@ -215,7 +215,7 @@ public class ScheduleRemoteCommand extends RhnAction {
pa.setPrerequisite(sra);
ActionManager.storeAction(pa);
showMessages(msgs, pa, server, numPackages, mode);
- showRemoteCommandMsg(msgs, true);
+ showRemoteCommandMsg(msgs, true, mode);
}
else {
List<Map<String, Long>> packs = getPackages(user, request, sessionSetLabel);
@@ -228,7 +228,7 @@ public class ScheduleRemoteCommand extends RhnAction {
sra.setPrerequisite(pa);
ActionManager.storeAction(sra);
showMessages(msgs, sra, server, numPackages, mode);
- showRemoteCommandMsg(msgs, false);
+ showRemoteCommandMsg(msgs, false, mode);
}
SessionSetHelper.obliterate(request, sessionSetLabel);
return msgs;
@@ -254,6 +254,13 @@ public class ScheduleRemoteCommand extends RhnAction {
form.set("timeout", new Long(600));
form.set("script", "#!/bin/sh");
form.set("mode", request.getParameter("mode"));
+ getStrutsDelegate().prepopulateDatePicker(request,
+ form, "date", DatePicker.YEAR_RANGE_POSITIVE);
+ Date date = getStrutsDelegate().readDatePicker(
+ form, "date", DatePicker.YEAR_RANGE_POSITIVE);
+
+ request.setAttribute("scheduledDate",
+ LocalizationService.getInstance().formatDate(date));
}
private List<Map<String, Long>> toList(Set<String> set) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 72d6dab..6a01a93 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -6405,11 +6405,26 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
<trans-unit id="removeconfirm.jsp.runremotecommand">
-<source>Run Remote Command</source>
+<source>Add Remote Command To Package Removal</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/RemoveConfirm.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="installconfirm.jsp.runremotecommand">
+<source>Add Remote Command To Package Install</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/RemoveConfirm.do</context>
+ </context-group>
+ </trans-unit>
+
+ <trans-unit id="upgradeconfirm.jsp.runremotecommand">
+<source>Add Remote Command To Package Upgrade</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/RemoveConfirm.do</context>
</context-group>
</trans-unit>
+
+
<!-- PROBE EDIT PAGE -->
<trans-unit id="probeedit.jsp.editprobe">
@@ -6708,20 +6723,20 @@ value for this entitlement, excluding the default organization's consumption.</s
</trans-unit>
<trans-unit id="scheduleremote.jsp.schedulepackageremoval">
-<source>Schedule Package Removal</source>
+<source>Confirm Remote Command and Schedule Package Removal</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
</trans-unit>
<trans-unit id="scheduleremote.jsp.schedulepackageupgrade">
-<source>Schedule Package Upgrade</source>
+<source>Confirm Remote Command and Schedule Package Upgrade</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
</trans-unit>
<trans-unit id="scheduleremote.jsp.schedulepackageinstall">
-<source>Schedule Package Install</source>
+<source>Confirm Remote Command and Schedule Package Install</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
@@ -7153,18 +7168,42 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
- <trans-unit id="message.remotecommandbefore">
-<source>The remote command action was scheduled to run <strong>before</strong> the package Remove action.</source>
+ <trans-unit id="message.remotecommandbefore.remove">
+<source>The remote command action was scheduled to run <strong>before</strong> the package remove action.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
</context-group>
</trans-unit>
- <trans-unit id="message.remotecommandafter">
-<source>The remote command action was scheduled to run <strong>after</strong> the package Remove action.</source>
+ <trans-unit id="message.remotecommandafter.remove">
+<source>The remote command action was scheduled to run <strong>after</strong> the package remove action.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="message.remotecommandbefore.install">
+<source>The remote command action was scheduled to run <strong>before</strong> the package install action.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="message.remotecommandafter.install">
+<source>The remote command action was scheduled to run <strong>after</strong> the package install action.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="message.remotecommandbefore.upgrade">
+<source>The remote command action was scheduled to run <strong>before</strong> the package upgrade action.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="message.remotecommandafter.upgrade">
+<source>The remote command action was scheduled to run <strong>after</strong> the package upgrade action.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/details/packages/PackageList.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="installpkgs.jsp.installpackages">
<source>Install Selected Packages</source>
<context-group name="ctx">
@@ -7177,12 +7216,6 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/systems/details/packages/InstallPackageConfirm.do</context>
</context-group>
</trans-unit>
- <trans-unit id="installconfirm.jsp.runremotecommand">
-<source>Run Remote Command</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/packages/InstallConfirm.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="installconfirm.jsp.widgetsummary">
<source>You may schedule the package installations to take place as soon as possible, or no sooner than a specified time:</source>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index d0feda7..075b1fe 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -36,7 +36,6 @@
<c:if test="${not empty requestScope.pageList}">
<div align="right">
-
<div align="left">
<p><bean:message key="${widgetSummary}"/></p>
</div>
@@ -64,6 +63,27 @@
</table>
<hr />
+ <c:if test="${not empty requestScope.enableRemoteCommand}">
+ <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" acl="system_feature(ftr_remote_command); client_capable(script.run)">
+ <c:choose>
+ <c:when test="${requestScope.mode == 'remove'}">
+ <input type="submit"
+ name ="dispatch"
+ value='<bean:message key="removeconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:when test="${requestScope.mode == 'install'}">
+ <input type="submit"
+ name ="dispatch"
+ value='<bean:message key="installconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:otherwise>
+ <input type="submit"
+ name ="dispatch"
+ value='<bean:message key="upgradeconfirm.jsp.runremotecommand"/>'/>
+ </c:otherwise>
+ </c:choose>
+ </rhn:require>
+ </c:if>
<input type="submit"
name ="dispatch"
value='<bean:message key="installconfirm.jsp.confirm"/>'/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
index c931ca6..50dd513 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
@@ -44,11 +44,7 @@
<tr>
<th><bean:message key="scheduleremote.jsp.nosoonerthan" />:</th>
<td>
- <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="confirm.jsp.selection"/>"
- title="<bean:message key="confirm.jsp.selection"/>"/>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
+ ${requestScope.scheduledDate}
</td>
</tr>
</table>
@@ -58,6 +54,13 @@
<html:hidden property="sid" value="${param.sid}" />
<html:hidden property="mode" value="${param.mode}" />
<html:hidden property="submitted" value="true" />
+ <html:hidden property="use_date" />
+ <html:hidden property="date_year" />
+ <html:hidden property="date_month" />
+ <html:hidden property="date_day" />
+ <html:hidden property="date_hour" />
+ <html:hidden property="date_minute" />
+ <html:hidden property="date_am_pm" />
<div align="right">
<hr />
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index d91dba7..b627bf4 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2617,6 +2617,9 @@
<forward name="confirm"
path="/systems/details/packages/Packages.do"
redirect="true" />
+ <forward name="remotecmd"
+ path="/systems/details/packages/ScheduleRemoteCommand.do"
+ redirect="true" />
</action>
<action path="/systems/details/packages/VerifyPackages"
@@ -2639,7 +2642,7 @@
path="/WEB-INF/pages/systems/details/packages/packageconfirm.jsp"/>
<forward name="confirm"
path="/systems/details/packages/Packages.do"
- redirect="true" />
+ redirect="true" />
</action>
<action path="/systems/details/packages/PackageList"
@@ -2663,6 +2666,9 @@
<forward name="confirm"
path="/systems/details/packages/Packages.do"
redirect="true" />
+ <forward name="remotecmd"
+ path="/systems/details/packages/ScheduleRemoteCommand.do"
+ redirect="true" />
</action>
<action path="/systems/details/packages/UpgradableList"
@@ -2685,7 +2691,10 @@
path="/WEB-INF/pages/systems/details/packages/packageconfirm.jsp"/>
<forward name="confirm"
path="/systems/details/packages/Packages.do"
- redirect="true"/>
+ redirect="true"/>
+ <forward name="remotecmd"
+ path="/systems/details/packages/ScheduleRemoteCommand.do"
+ redirect="true" />
</action>
<action path="/systems/details/packages/ScheduleRemoteCommand"
14 years, 3 months
Changes to 'refs/tags/spacewalk-0.9.1-1'
by Michael Mraka
Tag 'spacewalk-0.9.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-19 15:47 +0000
Tagging package [spacewalk] version [0.9.1-1] in directory [spacewalk/package/].
Changes since spacewalk-setup-0.9.1-1:
Joshua Roys (1):
rhnsd: check return value of regcomp
Michael Mraka (2):
modified release name
Automatic commit of package [spacewalk] release [0.9.1-1].
---
client/rhel/rhnsd/rhnsd.c | 5 ++++-
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 10 +++++++---
3 files changed, 12 insertions(+), 5 deletions(-)
---
14 years, 3 months
2 commits - rel-eng/packages spacewalk/package
by Michael Mraka
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 3223379419d92d754b675fedd38fc14cefb3f395
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 19 16:47:28 2010 +0100
Automatic commit of package [spacewalk] release [0.9.1-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk
index 0734ee9..998801f 100644
--- a/rel-eng/packages/spacewalk
+++ b/rel-eng/packages/spacewalk
@@ -1 +1 @@
-0.8.1-1 spacewalk/package/
+0.9.1-1 spacewalk/package/
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index fd49cb5..2fa023b 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,7 +1,7 @@
%define release_name Smile
Name: spacewalk
-Version: 0.9.0
+Version: 0.9.1
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf
%changelog
+* Fri Mar 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1
+- modified Spacewalk 0.9 release name
+
* Thu Jan 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.1-1
- droped spacewalk-cypress from Requires
- removed spacewalk-moon (sub)package as it is not used anywhere
commit 772f3fb11a4c048a733f7814722c542229acae6b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 19 16:43:14 2010 +0100
modified release name
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 9576abd..fd49cb5 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,4 +1,4 @@
-%define release_name Bowling
+%define release_name Smile
Name: spacewalk
Version: 0.9.0
@@ -136,7 +136,8 @@ Solaris machines.
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_sysconfdir}
-echo "Spacewalk release %{version} (%{release_name})" > $RPM_BUILD_ROOT/%{_sysconfdir}/spacewalk-release
+SW_REL=$(echo %{version} | awk -F. '{print $1"."$2}')
+echo "Spacewalk release $SW_REL (%{release_name})" > $RPM_BUILD_ROOT/%{_sysconfdir}/spacewalk-release
install -d $RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d
for i in oracle postgresql ; do
cat <<EOF >$RPM_BUILD_ROOT/%{_datadir}/spacewalk/setup/defaults.d/$i-backend.conf
14 years, 3 months
client/rhel
by Joshua Roys
client/rhel/rhnsd/rhnsd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit d86296b02a9d2d0ce5eb71cf838709e8eb7e1cf3
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Fri Mar 19 08:29:48 2010 -0400
rhnsd: check return value of regcomp
diff --git a/client/rhel/rhnsd/rhnsd.c b/client/rhel/rhnsd/rhnsd.c
index 1e8fe21..682085e 100644
--- a/client/rhel/rhnsd/rhnsd.c
+++ b/client/rhel/rhnsd/rhnsd.c
@@ -583,8 +583,11 @@ static int parse_systemid_path(char* systemid_path, int systemid_path_length)
FILE* config_file;
regex_t re_systemIdPath;
regmatch_t submatch[SYSTEMID_NMATCH];
+ const char *regex = "^[[:space:]]*systemIdPath[[:space:]]*=[[:space:]]*([[:print:]]+)";
+
+ if (regcomp(&re_systemIdPath, regex, REG_EXTENDED) != 0)
+ return ret;
- regcomp(&re_systemIdPath,"^[[:space:]]*systemIdPath[[:space:]]*=[[:space:]]*([[:print:]]+)", REG_EXTENDED);
if (NULL != (config_file = fopen(RHN_UP2DATE, "r") ))
{
char line[MAX_CONFIG_LINE_SIZE];
14 years, 3 months
Changes to 'refs/tags/spacewalk-setup-0.9.1-1'
by Michael Mraka
Tag 'spacewalk-setup-0.9.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-19 12:26 +0000
Tagging package [spacewalk-setup] version [0.9.1-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-0.9.11-1:
Justin Sherrill (2):
fixing some wsgi error handling, so it is more graceful when handling errors and other status codes
removing log debug
Michael Mraka (3):
id is already primary key so drop this useless index
let's smile for a while :-)
Automatic commit of package [spacewalk-setup] release [0.9.1-1].
---
backend/server/wsgi/wsgiRequest.py | 11 +++++-
rel-eng/packages/spacewalk-setup | 2 -
schema/spacewalk/common/tables/rhnPackageKey.sql | 4 --
schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/004-rhnPackageKey-drop-index.sql | 1
spacewalk/setup/lib/Spacewalk/Setup.pm | 18 +++-------
spacewalk/setup/spacewalk-setup.spec | 6 ++-
6 files changed, 22 insertions(+), 20 deletions(-)
---
14 years, 3 months
2 commits - rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 18 ++++++------------
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
3 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit ed9fd14e7918e772e57f80cbe4ff5a2970597fc0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 19 13:26:19 2010 +0100
Automatic commit of package [spacewalk-setup] release [0.9.1-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d1595c2..29d1129 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.8.1-1 spacewalk/setup/
+0.9.1-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 15d995e..9f62f4c 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.9.0
+Version: 0.9.1
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Fri Mar 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.1-1
+- let's smile in Spacewalk 0.9
+- 566124 - spacewalk-setup-jabberd splited from spacewalk-setup
+
* Mon Dec 7 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.8.1-1
- change spinning patter to bowling
commit 8c3e57dc6534174beebe85837c80d905fbed6786
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 19 13:24:17 2010 +0100
let's smile for a while :-)
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index ad246ee..8a1e731 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -306,18 +306,12 @@ sub upgrade_stop_services {
my $spinning_callback_count;
my @spinning_pattern = (
- '______|||',
- 'o_____|||',
- '_o____|||',
- '__o___|||',
- '___o__|||',
- '____o_|||',
- '_____o/||',
- '______o/|',
- '_______o/',
- '________o',
- '_________',
- '______///',
+ ':-)',
+ ':-/',
+ ':-|',
+ ':-\\',
+ '8-0',
+ '8-)',
);
my $spinning_pattern_maxlength = 0;
14 years, 3 months