java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java | 44 ++++------
1 file changed, 20 insertions(+), 24 deletions(-)
New commits:
commit 58a6e537283f659ce01152c73e511c642272f33c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 15:37:53 2010 -0400
580086 - cleaning up some code related with system group intersection and fixing one possible cause of not calculating the intersection correctly
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
index ca78cfd..ac87677 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
@@ -127,36 +127,35 @@ public class SystemGroupListSetupAction extends RhnAction {
return mapping.findForward("default");
}
- Iterator groups = groupSet.getElements().iterator();
- List firstList = new ArrayList();
- List secondList = new ArrayList();
+ // Iterator groups = groupSet.getElements().iterator();
+ List<Long> firstList = new ArrayList<Long>();
+ List<Long> secondList = new ArrayList<Long>();
//for the first group, add all the systems to firstList
- Long sgid = ((RhnSetElement)groups.next()).getElement();
- Iterator systems = SystemManager.systemsInGroup(sgid, null).iterator();
- while (systems.hasNext()) {
- Long id = new Long(((SystemOverview)systems.next()).getId().longValue());
+ Long sgid = groupSet.getElementValues().iterator().next();
+ groupSet.removeElement(sgid);
+
+ for (SystemOverview system : SystemManager.systemsInGroup(sgid, null)) {
+ Long id = system.getId();
firstList.add(id);
}
//for every subsequent group, remove systems that aren't in the intersection
- while (groups.hasNext()) { //for every group
- Long groupId = ((RhnSetElement)groups.next()).getElement();
- Iterator systemList = SystemManager.systemsInGroup(groupId, null).iterator();
+ for (Long groupId : groupSet.getElementValues()) { //for every group
- while (systemList.hasNext()) { //for every system in each group
- Long id = new Long(((SystemOverview)systemList.next()).getId()
- .longValue());
+ //for every system in each group
+ for (SystemOverview sys : SystemManager.systemsInGroup(groupId, null)) {
+ Long id = sys.getId();
secondList.add(id);
}
firstList = listIntersection(firstList, secondList);
+ secondList = new ArrayList<Long>();
}
//add all the systems to the set
- Iterator i = firstList.iterator();
- while (i.hasNext()) {
- systemSet.addElement((Long)i.next());
+ for (Long i : firstList) {
+ systemSet.addElement(i);
}
RhnSetManager.store(systemSet);
@@ -179,15 +178,12 @@ public class SystemGroupListSetupAction extends RhnAction {
}
- private List listIntersection(List one, List two) {
-
- List retval = new ArrayList();
- Iterator i = one.iterator();
+ private List listIntersection(List<Long> one, List<Long> two) {
- while (i.hasNext()) {
- Long next = (Long)i.next();
- if (two.contains(next)) {
- retval.add(next);
+ List<Long> retval = new ArrayList<Long>();
+ for (Long i : one) {
+ if (two.contains(i)) {
+ retval.add(i);
}
}
13 years, 9 months
2 commits - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java | 5 +++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 10 ++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 0f6c23433d1b1d6232c89fbaf4c301b9b5561639
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 15:06:20 2010 -0400
checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
index fd1b997..c863675 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java
@@ -264,6 +264,7 @@ public class ScheduleHandler extends BaseHandler {
* Reschedule all actions in the given list.
* @param sessionKey The sessionkey for the session containing the logged in user.
* @param actionIds The list of ids for actions to reschedule.
+ * @param onlyFailed only reschedule failed actions
* @return Returns a list of actions with details
* @throws FaultException A FaultException is thrown if one of the actions provided
* is invalid.
@@ -275,8 +276,8 @@ public class ScheduleHandler extends BaseHandler {
* "True to only reschedule failed actions, False to reschedule all")
* @xmlrpc.returntype #return_int_success()
*/
- public int rescheduleActions(String sessionKey, List<Integer> actionIds, boolean onlyFailed)
- throws FaultException {
+ public int rescheduleActions(String sessionKey, List<Integer> actionIds,
+ boolean onlyFailed) throws FaultException {
// Get the logged in user
User loggedInUser = getLoggedInUser(sessionKey);
commit b7aba4a8401ec8d92a825a6c8fe04b3fca613826
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 15:05:46 2010 -0400
checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 94159c3..8e09e98 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1041,6 +1041,7 @@ public class SystemHandler extends BaseHandler {
* Get the latest available version of a package for each system
* @param sessionKey The sessionKey containing the logged in user
* @param systemIds The IDs of the systems in question
+ * @param name the package name
* @return Returns an a map with the latest available package for each system
* @throws FaultException A FaultException is thrown if the server corresponding to
* sid cannot be found.
@@ -1063,8 +1064,8 @@ public class SystemHandler extends BaseHandler {
* #array_end()
*
*/
- public List listLatestAvailablePackage(String sessionKey, List<Integer> systemIds, String name)
- throws FaultException {
+ public List listLatestAvailablePackage(String sessionKey, List<Integer> systemIds,
+ String name) throws FaultException {
// Get the logged in user
User loggedInUser = getLoggedInUser(sessionKey);
@@ -1081,7 +1082,7 @@ public class SystemHandler extends BaseHandler {
if (pkgEvr != null) {
// find the latest package available to each system
Package pkg = PackageManager.guestimatePackageBySystem(sid.longValue(),
- (Long) pkgEvr.get("name_id"), (Long) pkgEvr.get("evr_id"),
+ (Long) pkgEvr.get("name_id"), (Long) pkgEvr.get("evr_id"),
null, loggedInUser.getOrg());
// build the hash to return
@@ -1095,7 +1096,8 @@ public class SystemHandler extends BaseHandler {
if (pkg.getPackageEvr().getEpoch() != null) {
pkgMap.put("epoch", pkg.getPackageEvr().getEpoch());
- } else {
+ }
+ else {
pkgMap.put("epoch", "");
}
13 years, 9 months
spacecmd/src
by aparsons
spacecmd/src/lib/system.py | 88 +++++++++++++++++++++++++++------------------
1 file changed, 53 insertions(+), 35 deletions(-)
New commits:
commit 863bd0e2ca4cf9bd2e0bc18ffd2f481f564050fe
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 14:26:04 2010 -0400
make system_installpackage use the new API system.listLatestAvailablePackage
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 50f59e1..640ce14 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -512,33 +512,47 @@ def do_system_installpackage(self, args):
packages_to_install = args
- jobs = []
+ # get the ID for each system
+ system_ids = []
for system in sorted(systems):
- logging.debug('Getting installable packages for %s' % system)
-
system_id = self.get_system_id(system)
if not system_id: continue
+ system_ids.append(system_id)
- # find the correct package IDs for each system
- avail_packages = self.client.system.listLatestInstallablePackages(\
- self.session, system_id)
+ jobs = {}
- package_ids = []
+ if self.check_api_version('10.11'):
for package in packages_to_install:
- found_package = False
+ logging.debug('Finding the latest version of %s' % package)
- for p in avail_packages:
- if package == p.get('name'):
- found_package = True
- package_ids.append(p.get('id'))
- break
+ avail_packages = \
+ self.client.system.listLatestAvailablePackage(self.session,
+ system_ids,
+ package)
- if not found_package:
- logging.warning('%s is not installable on %s' % (package, system))
- continue
+ for system in avail_packages:
+ system_id = system.get('id')
+ if system_id not in jobs:
+ jobs[system_id] = []
- if len(package_ids):
- jobs.append((system, system_id, package_ids))
+ # add this package to the system's queue
+ jobs[system_id].append(system.get('package').get('id'))
+ else:
+ #XXX: Satellite 5.3 compatibility
+ for system_id in system_ids:
+ logging.debug('Getting available packages for %s' % \
+ self.get_system_name(system_id))
+
+ avail_packages = \
+ self.client.system.listLatestInstallablePackages(self.session,
+ system_id)
+
+ for package in avail_packages:
+ if package.get('name') in packages_to_install:
+ if system_id not in jobs:
+ jobs[system_id] = []
+
+ jobs[system_id].append(package.get('id'))
if not len(jobs):
logging.warning('No packages to install')
@@ -546,37 +560,41 @@ def do_system_installpackage(self, args):
add_separator = False
- for job in jobs:
- (system, system_id, package_ids) = job
-
+ warnings = []
+ for system_id in jobs:
if add_separator: print self.SEPARATOR
add_separator = True
- print '%s:' % system
- for package_id in package_ids:
+ # warn the user if the request can not be 100% fulfilled
+ if len(jobs[system_id]) != len(packages_to_install):
+ # stash the warnings and show at the end so the user can see them
+ warnings.append(system_id)
+
+ print '%s:' % self.get_system_name(system_id)
+ for package_id in jobs[system_id]:
print self.get_package_name(package_id)
- print
- print 'Systems: %i' % len(jobs)
+ # show the warnings to the user
+ if len(warnings): print
+ for system_id in warnings:
+ logging.warning('%s does not have access to all requested packages' % \
+ self.get_system_name(system_id))
- if not self.user_confirm(): return
+ if not self.user_confirm('Install these packages [y/N]:'): return
scheduled = 0
- for job in jobs:
- (system, system_id, package_ids) = job
-
+ for system_id in jobs:
action_time = parse_time_input('now')
try:
- action_id = self.client.system.schedulePackageInstall(self.session,
- system_id,
- package_ids,
- action_time)
+ self.client.system.schedulePackageInstall(self.session,
+ system_id,
+ jobs[system_id],
+ action_time)
- logging.info('Action ID: %i' % action_id)
scheduled += 1
except:
- logging.error('Failed to schedule %s' % system)
+ logging.error('Failed to schedule %s' % self.get_system_name(system_id))
logging.info('Scheduled %i system(s)' % scheduled)
13 years, 9 months
backend/common
by Justin Sherrill
backend/common/rhnConfig.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 10bbbabc430fafa7ab94312baa31ede559796808
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 13:40:20 2010 -0400
577868 - adding proper handling of multiline key/value values
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index bde166d..193046f 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -599,7 +599,18 @@ def read_file(file):
reads a text config file and returns its lines in a list
"""
try:
- return open(file, 'rb').readlines()
+ lines = open(file, 'rb').readlines()
+ new_lines = []
+ combined = ''
+ for line in lines:
+ #if the line isn't part of a multiline, lets add it
+ if line.find('\\\n') < 0:
+ combined = combined + line
+ new_lines.append(combined)
+ combined = ''
+ else:
+ combined = combined + line.replace('\\\n', ' ')
+ return new_lines
except (IOError, OSError), e:
raise ConfigParserError("Can not read config file", file, e.args[1])
13 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/errata/Errata.java | 2 -
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 17 +++++++---
java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java | 5 ++
3 files changed, 19 insertions(+), 5 deletions(-)
New commits:
commit 45de5b68bea4460e05463cc22005c64e84a9d24b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 12:55:59 2010 -0400
582085 - fixing issue where renaming an errata with keywords would fail
diff --git a/java/code/src/com/redhat/rhn/domain/errata/Errata.java b/java/code/src/com/redhat/rhn/domain/errata/Errata.java
index 811b8c7..10a981e 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/Errata.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/Errata.java
@@ -310,7 +310,7 @@ public interface Errata {
/**
* @return Returns the keywords.
*/
- Set getKeywords();
+ Set<Keyword> getKeywords();
/**
* @param k The keywords to set.
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index b63e276..fce92fa 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -750,7 +750,7 @@ public class ErrataFactory extends HibernateFactory {
try {
session = HibernateFactory.getSession();
- retval = (List) session.
+ retval = session.
getNamedQuery("UnpublishedClonedErrata.findByOriginal")
.setParameter("original", original)
.setParameter("org", org).list();
@@ -779,7 +779,7 @@ public class ErrataFactory extends HibernateFactory {
try {
session = HibernateFactory.getSession();
- retval = (List) session.getNamedQuery("PublishedClonedErrata.findByOriginal")
+ retval = session.getNamedQuery("PublishedClonedErrata.findByOriginal")
.setParameter("original", original)
.setParameter("org", org).list();
}
@@ -808,6 +808,15 @@ public class ErrataFactory extends HibernateFactory {
}
/**
+ * Delete a Keyword
+ * @param deleteme Keyword to delete
+ */
+ public static void remove(Keyword deleteme) {
+ singleton.removeObject(deleteme);
+ }
+
+
+ /**
* Remove a file.
* @param deleteme ErrataFile to delete
*/
@@ -825,7 +834,7 @@ public class ErrataFactory extends HibernateFactory {
*/
public static List lookupByChannelSorted(Org org, Channel channel) {
- return (List) HibernateFactory.getSession().
+ return HibernateFactory.getSession().
getNamedQuery("PublishedErrata.lookupSortedByChannel")
.setParameter("org", org)
.setParameter("channel", channel)
@@ -845,7 +854,7 @@ public class ErrataFactory extends HibernateFactory {
public static List<Errata> lookupByChannelBetweenDates(Org org, Channel channel,
String startDate, String endDate) {
- return (List) HibernateFactory.getSession().
+ return HibernateFactory.getSession().
getNamedQuery("PublishedErrata.lookupByChannelBetweenDates")
.setParameter("org", org)
.setParameter("channel", channel)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
index 6e3a145..7db1c27 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
@@ -19,6 +19,8 @@ import com.redhat.rhn.common.hibernate.HibernateRuntimeException;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.errata.Errata;
+import com.redhat.rhn.domain.errata.ErrataFactory;
+import com.redhat.rhn.domain.errata.Keyword;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
@@ -208,6 +210,9 @@ public class EditAction extends LookupDispatchAction {
//Clear all the keywords and bugs we have, and then add the ones on page
if (e.getKeywords() != null) {
+ for (Keyword key : e.getKeywords()) {
+ ErrataFactory.remove(key);
+ }
e.getKeywords().clear();
}
if (e.getBugs() != null) {
13 years, 9 months
5 commits - spacecmd/src
by aparsons
spacecmd/src/lib/schedule.py | 110 +++++++++++++++++++++++++++++++++++--------
1 file changed, 92 insertions(+), 18 deletions(-)
New commits:
commit 60c60692a0d610781bac9280fcefcefb1854c7db
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 11:34:11 2010 -0400
don't include archived actions in the default call of schedule_list
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index f922c9e..2aa72d4 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -50,7 +50,17 @@ def print_schedule_summary(self, type, args):
elif type == 'archived':
actions = self.client.schedule.listArchivedActions(self.session)
elif type == 'all':
- actions = self.client.schedule.listAllActions(self.session)
+ # get actions in all states except archived
+ in_progress = self.client.schedule.listInProgressActions(self.session)
+ completed = self.client.schedule.listCompletedActions(self.session)
+ failed = self.client.schedule.listFailedActions(self.session)
+
+ actions = []
+ added = []
+ for action in in_progress + completed + failed:
+ if action.get('id') not in added:
+ actions.append(action)
+ added.append(action.get('id'))
else:
return
commit 0fe21b8b29e70a0642009f3c363d56808a71afaf
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 11:26:07 2010 -0400
significant improvement to the performance of schedule_list* functions
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index f077a19..f922c9e 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -66,22 +66,35 @@ def print_schedule_summary(self, type, args):
if end_date:
if action.get('earliest') > end_date: continue
- pending = self.client.schedule.listInProgressSystems(self.session,
- action.get('id'))
-
- completed = self.client.schedule.listCompletedSystems(self.session,
- action.get('id'))
-
- failed = self.client.schedule.listFailedSystems(self.session,
- action.get('id'))
-
- print '%s %s %s %s %s %s' % \
- (str(action.get('id')).ljust(6),
- action.get('earliest'),
- str(len(completed)).rjust(3),
- str(len(failed)).rjust(3),
- str(len(pending)).rjust(3),
- action.get('name'))
+ if self.check_api_version('10.11'):
+ print '%s %s %s %s %s %s' % \
+ (str(action.get('id')).ljust(6),
+ action.get('earliest'),
+ str(action.get('completedSystems')).rjust(3),
+ str(action.get('failedSystems')).rjust(3),
+ str(action.get('inProgressSystems')).rjust(3),
+ action.get('name'))
+ else:
+ # Satellite 5.3 compatibility
+ in_progress = \
+ self.client.schedule.listInProgressSystems(self.session,
+ action.get('id'))
+
+ completed = \
+ self.client.schedule.listCompletedSystems(self.session,
+ action.get('id'))
+
+ failed = \
+ self.client.schedule.listFailedSystems(self.session,
+ action.get('id'))
+
+ print '%s %s %s %s %s %s' % \
+ (str(action.get('id')).ljust(6),
+ action.get('earliest'),
+ str(len(completed)).rjust(3),
+ str(len(failed)).rjust(3),
+ str(len(in_progress)).rjust(3),
+ action.get('name'))
####################
commit c239630777a9969ac260d28c7eeb962b321c6456
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 10:45:23 2010 -0400
changed where an empty list is checked for in schedule_reschedule
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index bbdf889..f077a19 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -151,10 +151,6 @@ def do_schedule_reschedule(self, args):
failed_actions = self.client.schedule.listFailedActions(self.session)
failed_actions = [ a.get('id') for a in failed_actions ]
- if not len(failed_actions):
- logging.warning('No failed actions to reschedule')
- return
-
to_reschedule = []
# reschedule all failed actions
@@ -175,6 +171,10 @@ def do_schedule_reschedule(self, args):
logging.warning('%s is not a valid ID' % str(a))
continue
+ if not len(to_reschedule):
+ logging.warning('No failed actions to reschedule')
+ return
+
self.client.schedule.rescheduleActions(self.session, to_reschedule, True)
print 'Rescheduled %i action(s)' % len(to_reschedule)
commit 3facd97341b2ec38fceb7a0022e5031e70b563ec
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 10:32:19 2010 -0400
fixed tab completion in schedule_cancel
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index fa19165..bbdf889 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -92,7 +92,7 @@ def help_schedule_cancel(self):
def complete_schedule_cancel(self, text, line, beg, end):
try:
actions = self.client.schedule.listInProgressActions(self.session)
- return tab_completer([ a.get('id') for a in actions ], text)
+ return tab_completer([ str(a.get('id')) for a in actions ], text)
except:
return []
commit 6ea381c50ee1dd1cafa2b6abe0dc7c7bd0ac68ac
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Tue Jul 27 10:31:47 2010 -0400
added function schedule_reschedule
diff --git a/spacecmd/src/lib/schedule.py b/spacecmd/src/lib/schedule.py
index 63539ff..fa19165 100644
--- a/spacecmd/src/lib/schedule.py
+++ b/spacecmd/src/lib/schedule.py
@@ -130,6 +130,57 @@ def do_schedule_cancel(self, args):
####################
+def help_schedule_reschedule(self):
+ print 'schedule_reschedule: Reschedule failed actions'
+ print 'usage: schedule_reschedule ID|* ...'
+
+def complete_schedule_reschedule(self, text, line, beg, end):
+ try:
+ actions = self.client.schedule.listFailedActions(self.session)
+ return tab_completer([ str(a.get('id')) for a in actions ], text)
+ except Exception:
+ return []
+
+def do_schedule_reschedule(self, args):
+ args = parse_arguments(args)
+
+ if not len(args):
+ self.help_schedule_reschedule()
+ return
+
+ failed_actions = self.client.schedule.listFailedActions(self.session)
+ failed_actions = [ a.get('id') for a in failed_actions ]
+
+ if not len(failed_actions):
+ logging.warning('No failed actions to reschedule')
+ return
+
+ to_reschedule = []
+
+ # reschedule all failed actions
+ if '.*' in args:
+ if not self.user_confirm('Reschedule all failed actions [y/N]:'): return
+ to_reschedule = failed_actions
+ else:
+ # use the list of action IDs passed in
+ for a in args:
+ try:
+ action_id = int(a)
+
+ if action_id in failed_actions:
+ to_reschedule.append(action_id)
+ else:
+ logging.warning('%i is not a failed action' % action_id)
+ except ValueError:
+ logging.warning('%s is not a valid ID' % str(a))
+ continue
+
+ self.client.schedule.rescheduleActions(self.session, to_reschedule, True)
+
+ print 'Rescheduled %i action(s)' % len(to_reschedule)
+
+####################
+
def help_schedule_details(self):
print 'schedule_details: Show the details of a scheduled action'
print 'usage: schedule_details ID'
13 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit bfd2689cced31c96122a95e13710d82d143cae57
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 11:17:34 2010 -0400
582995 - fixing the automatic escaping of dollar signs within a raw kickstart
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 9297d82..f63582a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -371,8 +371,6 @@ public class KickstartFactory extends HibernateFactory {
KickstartUrlHelper.COBBLER_SERVER_VARIABLE, ksdataIn, ksession);
fileData = formatter.getFileData();
}
- // Escape the dollar signs
- fileData = StringUtils.replace(fileData, "$(", "\\$(");
Profile p = Profile.lookupById(CobblerXMLRPCHelper.getAutomatedConnection(),
ksdataIn.getCobblerId());
if (p != null && p.getKsMeta() != null) {
@@ -1031,7 +1029,7 @@ public class KickstartFactory extends HibernateFactory {
public static List<KickstartableTree> listUnsyncedKickstartTrees() {
String query = "KickstartableTree.getUnsyncedKickstartTrees";
Session session = HibernateFactory.getSession();
- return (List<KickstartableTree>) session.getNamedQuery(query).list();
+ return session.getNamedQuery(query).list();
}
/**
13 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 004fa0edef4ede2338ffb3410f331ce96b02f9bc
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Jul 27 09:32:45 2010 -0400
removing mistakenly included debug message
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index da78a9c..120ea7d 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -175,7 +175,6 @@ class ConnectionManager {
}
connectionUrl += dbName;
}
- LOG.fatal(connectionUrl);
hibProperties.put("hibernate.connection.url", connectionUrl);
config.addProperties(hibProperties);
13 years, 9 months
Changes to 'refs/tags/spacewalk-search-1.1.3-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.1.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-07-27 12:22 +0000
Tagging package [spacewalk-search] version [1.1.3-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-schema-1.1.21-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-search] release [1.1.3-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 9 months
rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 27ac30b67ae0eac9785e5961d61a78068e9ac3e3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jul 27 14:22:37 2010 +0200
Automatic commit of package [spacewalk-search] release [1.1.3-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 624caf4..126cf96 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.1.2-1 search-server/spacewalk-search/
+1.1.3-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index d516d18..cb49254 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.1.2
+Version: 1.1.3
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -112,6 +112,12 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Tue Jul 27 2010 Jan Pazdziora 1.1.3-1
+- hibernate.connection.url is now created dynamicaly from db_* variables
+ (michael.mraka(a)redhat.com)
+- code optimization (michael.mraka(a)redhat.com)
+- updated the ivy repo url for search server (shughes(a)redhat.com)
+
* Mon Jun 21 2010 Jan Pazdziora 1.1.2-1
- 576953 - fixing errata search case sensitivity and not searching on partial
cve name (jsherril(a)redhat.com)
13 years, 9 months