backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit cabd041c2f440f0a2e74e271429fc8cf0636720c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Mar 5 10:51:35 2010 -0500
fixing import to work with satellites running older versions of rhnLib
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 6a70279..88538fd 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -29,7 +29,11 @@ _LIBPATH = "/usr/share/rhn"
if _LIBPATH not in sys.path:
sys.path.append(_LIBPATH)
-from rhn import rhnLockfile
+try:
+ from rhn import rhnLockfile #new place for rhnLockFile
+except:
+ from common import rhnLockFile #old place for rhnLockFile
+
from satellite_tools.progress_bar import ProgressBar
from common import CFG, initCFG, initLOG, log_debug, log_error
from server import rhnSQL
14 years, 2 months
backend/server
by Joshua Roys
backend/server/configFilesHandler.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 25dd5837f6352c24d150adac680f12e2fa2709fd
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Mar 4 16:11:48 2010 +0000
568371 - fix an ORA-00918 on config file import
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index fca9484..3882a70 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -222,12 +222,12 @@ class ConfigFilesHandler(rhnHandler):
return result
_query_content_lookup = rhnSQL.Statement("""
- select id, c.checksum_type, c.checksum, file_size, contents, is_binary
- from rhnConfigContent, rhnChecksumView c
- where c.checksum = :checksum
- and c.checksum_type = :checksum_type
+ select cc.id, cv.checksum_type, cv.checksum, file_size, contents, is_binary
+ from rhnConfigContent cc, rhnChecksumView cv
+ where cv.checksum = :checksum
+ and cv.checksum_type = :checksum_type
and file_size = :file_size
- and checksum_id = c.id
+ and checksum_id = cv.id
""")
_query_insert_content = rhnSQL.Statement("""
14 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java | 53 +++++-----
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 9 -
java/code/webapp/WEB-INF/struts-config.xml | 3
3 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit ec6c07075589500acb45d4192e7f50352ddc2377
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 5 13:28:33 2010 +0100
559551 - ISE fixed for SyncSystems.do
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
index 5a2ceef..cddd5f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
@@ -21,7 +21,8 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.SessionSetHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.profile.ProfileManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -30,6 +31,9 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -39,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
* SyncSystemsSetupAction
* @version $Rev$
*/
-public class SyncSystemsSetupAction extends RhnAction {
+public class SyncSystemsSetupAction extends RhnAction implements Listable {
private static final String DATA_SET = "pageList";
private static final CompareSystemSetupAction DECL_ACTION =
@@ -55,50 +59,51 @@ public class SyncSystemsSetupAction extends RhnAction {
Long sid = requestContext.getRequiredParam(RequestContext.SID);
Long sid1 = requestContext.getRequiredParam(RequestContext.SID1);
-
User user = requestContext.getLoggedInUser();
Server server = SystemManager.lookupByIdAndUser(sid, user);
Server server1 = SystemManager.lookupByIdAndUser(sid1, user);
- DataResult itemsToBeSynced = getDataResult(request, user);
-
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+
DynaActionForm dynaForm = (DynaActionForm) formIn;
DatePicker picker = getStrutsDelegate().prepopulateDatePicker(request, dynaForm,
"date", DatePicker.YEAR_RANGE_POSITIVE);
-
+
+ if (requestContext.wasDispatched("schedulesync.jsp.schedulesync")) {
+ Map syncParam = new HashMap();
+ syncParam.put(RequestContext.SID, sid);
+ syncParam.put(RequestContext.SID1, sid1);
+ syncParam.put(RequestContext.DISPATCH,
+ request.getParameter(RequestContext.DISPATCH));
+ return getStrutsDelegate().forwardParams(mapping.findForward("sync"),
+ syncParam);
+ }
+
request.setAttribute("date", picker);
request.setAttribute("system", server);
request.setAttribute("system1", server1);
- requestContext.copyParamToAttributes(RequestContext.SID);
- requestContext.copyParamToAttributes(RequestContext.SID1);
- request.setAttribute(ListTagHelper.PARENT_URL,
- request.getRequestURI() + "?sid=" + sid + "&sid_1=" + sid1);
- request.setAttribute(DATA_SET, itemsToBeSynced);
-
+
return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ request.getParameterMap());
}
/**
* Gets the List of differing packages between two servers
- * @param request HttpServletRequest
- * @param user The logged in user
- * @param pc PageControl
+ * @param context RequestContext
* @return List of packages and differences
*/
- protected DataResult getDataResult(HttpServletRequest request, User user) {
+ public List getResult(RequestContext context) {
+ Long sid = context.getRequiredParam(RequestContext.SID);
+ Long sid1 = context.getRequiredParam(RequestContext.SID1);
+ User user = context.getLoggedInUser();
- RequestContext requestContext = new RequestContext(request);
-
- Long sid = requestContext.getRequiredParam("sid");
- Long sid1 = requestContext.getRequiredParam("sid_1");
-
- Set <String> pkgIdCombos = SessionSetHelper.lookupAndBind(request,
+ Set <String> pkgIdCombos = SessionSetHelper.lookupAndBind(context.getRequest(),
getDecl(sid));
DataResult dr = ProfileManager.prepareSyncToServer(sid, sid1,
user.getOrg().getId(), null, pkgIdCombos);
-
+
return dr;
}
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index 7ab7b39..6e756e4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
@@ -14,16 +14,14 @@
<bean:message key="schedulesync.jsp.profilesync" />
</h2>
-<html:form method="POST" action="/systems/details/packages/profiles/SyncSystemsSubmit">
+<rl:listset name="compareListSet">
<div class="page-summary">
<bean:message key="schedulesync.jsp.pagesummary"
arg0="${requestScope.system.name}"
arg1="${requestScope.system1.name}" />
</div>
- <rl:listset name="compareListSet">
- <rl:list dataset="pageList"
- width="100%"
+ <rl:list width="100%"
name="compareList"
styleclass="list"
emptykey="schedulesync.jsp.nopackagesselected">
@@ -74,8 +72,7 @@
<html:hidden property="sid_1" value="${param.sid_1}" />
<html:hidden property="set_label" value="packages_for_system_sync" />
- </rl:listset>
+</rl:listset>
-</html:form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index c522cd1..daa5925 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -3801,6 +3801,9 @@
type="com.redhat.rhn.frontend.action.rhnpackage.profile.SyncSystemsSetupAction">
<forward name="default"
path="/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp"/>
+ <forward name="sync"
+ path="/systems/details/packages/profiles/SyncSystemsSubmit.do"
+ redirect="true" />
</action>
<action path="/systems/details/packages/profiles/SyncSystemsSubmit"
14 years, 2 months
Changes to 'refs/tags/oracle-selinux-0.1-23.15'
by Jan Pazdziora
Tag 'oracle-selinux-0.1-23.15' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-03-05 11:40 +0000
Tagging package [oracle-selinux] version [0.1-23.15] in directory [selinux/oracle-selinux/].
Changes since spacewalk-proxy-installer-0.9.2-1:
Jan Pazdziora (1):
Automatic commit of package [oracle-selinux] minor release [0.1-23.15].
Joshua Roys (1):
566664 - handle null SELinux contexts in config uploads
Justin Sherrill (4):
514554 - adding back the ability to delete virt guests and fixing entitelment bug
570560 - fixing misleading channel creation warning message
handling error case a bit better for spacewalk-channel-remove
making Channel.getPackages() much more verbose
---
backend/satellite_tools/spacewalk-remove-channel | 3 +-
client/tools/rhncfg/config_common/file_utils.py | 4 ++-
client/tools/rhncfg/config_common/repository.py | 8 ++++---
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 2 +
java/code/src/com/redhat/rhn/domain/server/Server.java | 11 ++--------
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 -
rel-eng/packages/oracle-selinux | 2 -
selinux/oracle-selinux/oracle-selinux.spec | 5 +++-
9 files changed, 22 insertions(+), 17 deletions(-)
---
14 years, 2 months
rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c590381b3d8799a6e47332a382bae93a4a5b99e8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 5 12:40:41 2010 +0100
Automatic commit of package [oracle-selinux] minor release [0.1-23.15].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 4d6fa88..f2b02a7 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1-23.14 selinux/oracle-selinux/
+0.1-23.15 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 0a61739..4aa57dd 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -20,7 +20,7 @@
Name: oracle-selinux
Version: 0.1
-Release: 23.14%{?obtag}%{?dist}%{?repo}
+Release: 23.15%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
License: GPLv2+
@@ -208,6 +208,9 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Fri Mar 05 2010 Jan Pazdziora 0.1-23.15
+- bumpi up release to allow for rebuild on F12 where etcfile was removed
+
* Fri Jan 29 2010 Jan Pazdziora 0.1-23.14
- Do semodule -l before any semodule operation.
14 years, 2 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 354424619a8622349c663ba887516dfb96934a55
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 4 16:52:03 2010 -0500
making Channel.getPackages() much more verbose
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index adc6cbb..87a7596 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -383,9 +383,11 @@ public class Channel extends BaseDomainHelper implements Comparable {
}
/**
+ * @deprecated
* @return Returns the set of packages for this channel.
*/
public Set getPackages() {
+ log.warn("Channel.getPackages() called, very inefficient operation proceeding");
return packages;
}
14 years, 2 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e71ee32a72268fca31406f1eba7754bf6f26cf54
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 4 15:16:35 2010 -0500
handling error case a bit better for spacewalk-channel-remove
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 050c9a4..6a70279 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -63,7 +63,8 @@ def main():
try:
LOCK = rhnLockfile.Lockfile('/var/run/satellite-sync.pid')
except rhnLockfile.LockfileLockedException:
- systemExit(1, "ERROR: either another instance of spacewalk-remove-channel is running, or a satellite-sync is currently taking place.")
+ print("ERROR: Either another instance of spacewalk-remove-channel is running, or a satellite-sync is currently taking place.")
+ sys.exit(-1)
global options_table
14 years, 2 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e0674f232af3f8018982fd72b4b30743b778edfa
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 4 14:43:00 2010 -0500
570560 - fixing misleading channel creation warning message
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 665ef6f..2f64eb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -461,7 +461,7 @@ public class EditChannelAction extends RhnAction implements Listable {
}
catch (IllegalArgumentException iae) {
errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("edit.channel.invalidchannelsummary"));
+ new ActionMessage(iae.getMessage()));
}
return cid;
14 years, 2 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/server/Server.java | 11 ++--------
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 -
2 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 8631578e03a62b7329dab7fa5ff2742f5156c717
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 4 14:32:32 2010 -0500
514554 - adding back the ability to delete virt guests and fixing entitelment bug
the entitlement bug revolved around the system having its virt entry removed before calling the delete_system stored procedure, which treated it as a non-virt system. the fix is simply to delete the virt entry after the stored proc is called
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 098339a..2a6f0cd 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.domain.server;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.BaseDomainHelper;
import com.redhat.rhn.domain.Identifiable;
import com.redhat.rhn.domain.channel.Channel;
@@ -1362,14 +1363,8 @@ public class Server extends BaseDomainHelper implements Identifiable {
* @return <code>true</code> if the guest is deleted, <code>false</code> otherwise.
*/
public boolean deleteGuest(VirtualInstance guest) {
- boolean deleted = removeGuest(guest);
- log.debug("deleteGuest.deleted? " + deleted);
- // only remove the host from the virtual instance if it belongs to this server
- if (deleted) {
- guest.deleteGuestSystem();
- }
-
- return deleted;
+ guest.deleteGuestSystem();
+ return removeGuest(guest);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
index 0309707..6f14d28 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
@@ -89,7 +89,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction {
// Set parameter for the actions dropdown:
List actionOptions = new LinkedList();
String [] resourceBundleKeys = {
- //"virtualguestslist.jsp.deletesystem",
+ "virtualguestslist.jsp.deletesystem",
"virtualguestslist.jsp.startsystem",
"virtualguestslist.jsp.suspendsystem",
"virtualguestslist.jsp.resumesystem",
14 years, 2 months
client/tools
by Milan Zazrivec
client/tools/rhncfg/config_common/file_utils.py | 4 +++-
client/tools/rhncfg/config_common/repository.py | 8 +++++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 6777bc7b173974bef052b22d1107eca479fbda1c
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Mar 4 16:33:11 2010 +0100
566664 - handle null SELinux contexts in config uploads
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 7b609a0..d9c69b4 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -91,9 +91,11 @@ class FileProcessor:
result = ''
cur_sectx = lgetfilecon(path)[1]
+ if cur_sectx == None:
+ cur_sectx = ''
if file_struct.has_key('selinux_ctx'):
if cur_sectx != file_struct['selinux_ctx']:
- sectx_result = "SELinux contexts differ! Current context: %s\n" % cur_sectx
+ sectx_result = "SELinux contexts differ! Current: %s, expected: %s\n" % (cur_sectx, file_struct['selinux_ctx'])
if file_struct['filetype'] == 'symlink':
try:
diff --git a/client/tools/rhncfg/config_common/repository.py b/client/tools/rhncfg/config_common/repository.py
index 78abc9e..bc71a7d 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -28,10 +28,10 @@ import utils
from rhn_log import log_debug, die
#from rhn_rpc import rpclib
try:
- from selinux import getfilecon
+ from selinux import lgetfilecon
except:
# on rhel4 we do not support selinux
- def getfilecon(path):
+ def lgetfilecon(path):
return [0, ''];
@@ -132,7 +132,9 @@ class Repository:
ret['group'] = gr_name
self._gid_cache[gid] = gr_name
- ret['selinux_ctx'] = getfilecon(path)[1]
+ ret['selinux_ctx'] = lgetfilecon(path)[1]
+ if ret['selinux_ctx'] == None:
+ ret['selinux_ctx'] = ''
return ret
14 years, 2 months