backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 262b0b03cdb2c972520221b00db14bfe51ae2838
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:21:44 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 732ac6f..ed70bd8 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.5.24
+Version: 1.5.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.25-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.24-1
- 705002 - made query pg compatible
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index be7e658..9938210 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.24-1 backend/
+1.5.25-1 backend/
12 years, 11 months
backend/common backend/satellite_exporter backend/server client/rhel proxy/proxy
by Michael Mraka
backend/common/Makefile | 1
backend/common/UserDictCase.py | 79 -----------------
backend/common/rhnApache.py | 2
backend/common/rhnConfig.py | 2
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/basePackageUpload.py | 2
backend/server/handlers/xmlrpc/proxy.py | 2
backend/server/rhnSQL/driver_cx_Oracle.py | 2
backend/server/rhnSQL/driver_postgresql.py | 2
backend/server/rhnSQL/sql_row.py | 2
backend/server/rhnSQL/sql_table.py | 2
backend/server/rhnServer/server_hardware.py | 2
backend/server/rhnServer/server_wrapper.py | 2
backend/server/rhnUser.py | 2
backend/server/test/TestServer.py | 2
client/rhel/rhnlib/rhn/UserDictCase.py | 19 +++-
proxy/proxy/apacheHandler.py | 3
proxy/proxy/broker/rhnBroker.py | 3
proxy/proxy/rhnShared.py | 3
19 files changed, 35 insertions(+), 100 deletions(-)
New commits:
commit dcbda8b96d18de24cf4d6ad1f5d294787cc541c3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 14:44:29 2011 +0200
merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
diff --git a/backend/common/Makefile b/backend/common/Makefile
index ab01f14..c0245be 100644
--- a/backend/common/Makefile
+++ b/backend/common/Makefile
@@ -23,7 +23,6 @@ SPACEWALK_FILES = __init__ \
rhnTB \
rhnTranslate \
RPC_Base \
- UserDictCase \
checksum \
fileutils \
rhn_deb \
diff --git a/backend/common/UserDictCase.py b/backend/common/UserDictCase.py
deleted file mode 100644
index 2a97492..0000000
--- a/backend/common/UserDictCase.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2008--2010 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.
-#
-#
-
-from types import StringType
-from UserDict import UserDict
-
-# A dictionary with case insensitive keys
-class UserDictCase(UserDict):
- def __init__(self, data = None):
- self.kcase = {}
- UserDict.__init__(self, data)
- # some methods used to make the class work as a dictionary
- def __setitem__(self, key, value):
- lkey = key
- if isinstance(key, StringType):
- lkey = key.lower()
- self.data[lkey] = value
- self.kcase[lkey] = key
- def __getitem__(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- if not self.data.has_key(key):
- return None
- return self.data[key]
- def __delitem__(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- del self.data[key]
- del self.kcase[key]
- get = __getitem__
- def keys(self):
- return self.kcase.values()
- def items(self):
- return self.get_hash().items()
- def has_key(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- return self.data.has_key(key)
- def clear(self):
- self.data.clear()
- self.kcase.clear()
- # return this data as a real hash
- def get_hash(self):
- return reduce(lambda a, (ik, v), hc=self.kcase:
- a.update({ hc[ik] : v}) or a, self.data.items(), {})
-
- # return the data for marshalling
- def __getstate__(self):
- return self.get_hash()
- # we need a setstate because of the __getstate__ presence screws up deepcopy
- def __setstate__(self, state):
- self.__init__(state)
- # get a dictionary out of this instance ({}.update doesn't get instances)
- def dict(self):
- return self.get_hash()
- def update(self, updict):
- for (k, v) in updict.items():
- lk = k
- if isinstance(k, StringType):
- lk = k.lower()
- self.data[lk] = v
- self.kcase[lk] = k
- # Expose an iterator. This would normally fail if there is no iter()
- # function defined - but __iter__ will never be called on python 1.5.2
- def __iter__(self):
- return iter(self.data)
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index ec23ad2..e0f23e8 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -26,7 +26,7 @@ from spacewalk.common import apache
# Now local module imports
import rhnFlags
-from UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
from rhnLog import log_debug
from rhnLog import log_error
from rhnTranslate import cat
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index 6c6b786..d532290 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -18,7 +18,7 @@ import sys
import glob
import stat
-from UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
_CONFIG_ROOT = '/etc/rhn'
diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py
index 255b717..9f53cbf 100644
--- a/backend/satellite_exporter/handlers/non_auth_dumper.py
+++ b/backend/satellite_exporter/handlers/non_auth_dumper.py
@@ -19,6 +19,8 @@ Non-authenticated dumper
import os
import xmlrpclib
import gzip
+
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.server import rhnSQL, rhnLib
@@ -27,7 +29,6 @@ from spacewalk.server.importlib.backendLib import localtime
from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
from spacewalk.satellite_tools.exporter import exportLib
from spacewalk.satellite_tools.disk_dumper import dumper
diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py
index b77ce1b..02f1623 100644
--- a/backend/server/basePackageUpload.py
+++ b/backend/server/basePackageUpload.py
@@ -14,11 +14,11 @@
#
# $Id$
+from rhn.UserDictCase import UserDictCase
from spacewalk.common import apache
from spacewalk.common.rhnLog import log_debug
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common.UserDictCase import UserDictCase
class BasePackageUpload:
diff --git a/backend/server/handlers/xmlrpc/proxy.py b/backend/server/handlers/xmlrpc/proxy.py
index 70d2056..6fddce0 100644
--- a/backend/server/handlers/xmlrpc/proxy.py
+++ b/backend/server/handlers/xmlrpc/proxy.py
@@ -17,12 +17,12 @@
import time
# common module imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common import rhnFlags
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
# local module imports
from spacewalk.server.rhnLib import computeSignature
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py
index f7a2401..cf8b929 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -29,11 +29,11 @@ import os
import re
import types
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
from spacewalk.common import rhnConfig
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
from sql_base import adjust_type
from const import ORACLE
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index bb8014f..1dfddea 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -28,12 +28,12 @@ if not hasattr(psycopg2, 'extensions'):
import psycopg2.extensions
import sql_base
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
from spacewalk.server.rhnSQL import sql_types
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
from const import POSTGRESQL
def convert_named_query_params(query):
diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py
index d34ce67..0b9a9bb 100644
--- a/backend/server/rhnSQL/sql_row.py
+++ b/backend/server/rhnSQL/sql_row.py
@@ -17,8 +17,8 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
import sql_base
import sql_lib
diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py
index 1aa2a75..8171b1a 100644
--- a/backend/server/rhnSQL/sql_table.py
+++ b/backend/server/rhnSQL/sql_table.py
@@ -18,8 +18,8 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
import sql_base
import sql_lib
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index d6d38e3..4f69558 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -19,9 +19,9 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common.UserDictCase import UserDictCase
from spacewalk.common.rhnTB import Traceback
from spacewalk.server import rhnSQL
diff --git a/backend/server/rhnServer/server_wrapper.py b/backend/server/rhnServer/server_wrapper.py
index 758a6b6..11c4d52 100644
--- a/backend/server/rhnServer/server_wrapper.py
+++ b/backend/server/rhnServer/server_wrapper.py
@@ -24,7 +24,7 @@ from server_packages import Packages
from server_history import History
from server_solarispatches import SolarisPatches
-from spacewalk.common.UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
class ServerWrapper(Packages, Hardware, History, SolarisPatches):
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 5fab8bc..1399a2e 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -21,11 +21,11 @@ import crypt
import string
# Global Modules
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault, rhnException
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
import rhnSQL
import rhnSession
diff --git a/backend/server/test/TestServer.py b/backend/server/test/TestServer.py
index 26cb6a8..7c253e5 100644
--- a/backend/server/test/TestServer.py
+++ b/backend/server/test/TestServer.py
@@ -15,9 +15,9 @@
#
import time
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL, rhnServer, rhnAction
from spacewalk.common import rhnConfig, rhnFlags
-from spacewalk.common.UserDictCase import UserDictCase
import server.xmlrpc.up2date
from misc_functions import create_activation_key
import misc_functions
diff --git a/client/rhel/rhnlib/rhn/UserDictCase.py b/client/rhel/rhnlib/rhn/UserDictCase.py
index f5d5302..e6c217b 100644
--- a/client/rhel/rhnlib/rhn/UserDictCase.py
+++ b/client/rhel/rhnlib/rhn/UserDictCase.py
@@ -1,10 +1,21 @@
+#
+# Copyright (c) 2001--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.
+#
+#
# This file implements a case insensitive dictionary on top of the
# UserDict standard python class
#
-# Copyright (c) 2001-2005, Red Hat Inc.
-# All rights reserved.
-#
-# $Id$
from types import StringType
from UserDict import UserDict
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 8881c90..39b617b 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -26,12 +26,13 @@ from rhnConstants import *
from rhn import rpclib, connections
## common imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnLog import initLOG, log_debug, log_error
from spacewalk.common.rhnApache import rhnApache
from spacewalk.common.rhnTB import Traceback
from spacewalk.common.rhnException import rhnFault, rhnException
-from spacewalk.common import rhnFlags, UserDictCase, apache
+from spacewalk.common import rhnFlags, apache
from spacewalk.common.rhnLib import setHeaderValue
## local imports
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index b96bf46..cc83804 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -23,11 +23,12 @@ import re
from urlparse import urlsplit, urlparse, urlunparse
# common module imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLib import parseUrl
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common import UserDictCase, rhnFlags, apache
+from spacewalk.common import rhnFlags, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 84131ef..172a812 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -26,11 +26,12 @@ from rhn import connections
from rhn.SSL import TimeoutException
## common imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnTB import Traceback
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault, rhnException
from spacewalk.common.rhnLog import log_debug, log_error
-from spacewalk.common import UserDictCase, rhnFlags, rhnLib, apache
+from spacewalk.common import rhnFlags, rhnLib, apache
from spacewalk.common.rhnTranslate import _
## local imports
12 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.5.32-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.32-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-19 16:30 +0000
Tagging package [spacewalk-java] version [1.5.32-1] in directory [java/].
Changes since rhn-virtualization-5.4.23-1:
Tomas Lestach (2):
659138 - fix Custom Quartz format error handling
Automatic commit of package [spacewalk-java] release [1.5.32-1].
---
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 13 +++++++---
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 16 insertions(+), 5 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 14da52e85e54e717fbf7065c989199154e554ec3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 18:30:07 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c45a565..d40944f 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.5.31
+Version: 1.5.32
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.32-1
+- 659138 - fix Custom Quartz format error handling (tlestach(a)redhat.com)
+- 659138 - fix repeat-task-picker input tag (tlestach(a)redhat.com)
+
* Wed May 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.31-1
- 659138 - fix message on the schedule create page (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 69391f7..31026b6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.31-1 java/
+1.5.32-1 java/
12 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 13 +++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 74c41853fae70b9e3f81c1cd6a5b3bd6a5e8a177
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 18:28:03 2011 +0200
659138 - fix Custom Quartz format error handling
fixing issues, when Custome Quartz format is submitted empty or in wrong format
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
index 436e2b4..db7c810 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.TaskomaticApiException;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -87,7 +88,7 @@ public class ScheduleDetailAction extends RhnAction {
RecurringEventPicker picker = RecurringEventPicker.prepopulatePicker(
request, "date", null);
- if (picker.isDisabled()) {
+ if (picker.isDisabled() || StringUtils.isEmpty(picker.getCronEntry())) {
if (scheduleId == null) {
prepDropdowns(ctx);
createErrorMessage(request, "message.scheduledisabled", null);
@@ -122,8 +123,14 @@ public class ScheduleDetailAction extends RhnAction {
mapping.findForward("success"), params);
}
catch (TaskomaticApiException e) {
- createErrorMessage(request,
- "repos.jsp.message.taskomaticdown", null);
+ if (e.getMessage().contains("InvalidParamException")) {
+ createErrorMessage(request,
+ "repos.jsp.message.invalidcron", picker.getCronEntry());
+ }
+ else {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
return getStrutsDelegate().forwardParams(
mapping.findForward("default"), params);
}
12 years, 11 months
Changes to 'refs/tags/rhn-virtualization-5.4.23-1'
by Miroslav Suchý
Tag 'rhn-virtualization-5.4.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-19 15:52 +0000
Tagging package [rhn-virtualization] version [5.4.23-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-web-1.5.12-1:
Miroslav Suchý (4):
rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-virtualization-host rhn-virtualization
rhn-virtualization-host.noarch: E: non-executable-script /usr/share/rhn/virtualization/localvdsm.py 0644L /usr/bin/python
simplify spec
Automatic commit of package [rhn-virtualization] release [5.4.23-1].
Tomas Lestach (1):
659138 - fix repeat-task-picker input tag
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 84 +++-------
client/tools/rhn-virtualization/scripts/rhn-virtualization-host | 4
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 5
rel-eng/packages/rhn-virtualization | 2
4 files changed, 31 insertions(+), 64 deletions(-)
---
12 years, 11 months
4 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhn-virtualization/rhn-virtualization.spec | 84 +++-------
client/tools/rhn-virtualization/scripts/rhn-virtualization-host | 4
rel-eng/packages/rhn-virtualization | 2
3 files changed, 29 insertions(+), 61 deletions(-)
New commits:
commit 7da7a32968f5f08de4a4e610b8a550d07cc7639d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:52:37 2011 +0200
Automatic commit of package [rhn-virtualization] release [5.4.23-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 49a35e0..6372ad6 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.22
+Version: 5.4.23
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,6 +134,12 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu May 19 2011 Miroslav Suchý 5.4.23-1
+- simplify spec
+- rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-
+ virtualization-host rhn-virtualization
+- fix spelling error
+
* Fri Apr 15 2011 Jan Pazdziora 5.4.22-1
- build rhn-virtualization on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index e46a96b..061cfe2 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.22-1 client/tools/rhn-virtualization/
+5.4.23-1 client/tools/rhn-virtualization/
commit c6f3e3c74edbf7955e55b4e18d33aed6fa39ba1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:51:20 2011 +0200
simplify spec
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index b2d2575..49a35e0 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -104,24 +104,12 @@ rm -rf $RPM_BUILD_ROOT
%files common
%defattr(-,root,root,-)
%dir %{rhn_dir}/virtualization
-%{rhn_dir}/virtualization/__init__.py
-%{rhn_dir}/virtualization/__init__.pyc
-%{rhn_dir}/virtualization/__init__.pyo
-%{rhn_dir}/virtualization/batching_log_notifier.py
-%{rhn_dir}/virtualization/batching_log_notifier.pyc
-%{rhn_dir}/virtualization/batching_log_notifier.pyo
-%{rhn_dir}/virtualization/constants.py
-%{rhn_dir}/virtualization/constants.pyc
-%{rhn_dir}/virtualization/constants.pyo
-%{rhn_dir}/virtualization/errors.py
-%{rhn_dir}/virtualization/errors.pyc
-%{rhn_dir}/virtualization/errors.pyo
-%{rhn_dir}/virtualization/notification.py
-%{rhn_dir}/virtualization/notification.pyc
-%{rhn_dir}/virtualization/notification.pyo
-%{rhn_dir}/virtualization/util.py
-%{rhn_dir}/virtualization/util.pyc
-%{rhn_dir}/virtualization/util.pyo
+%{rhn_dir}/virtualization/__init__.py*
+%{rhn_dir}/virtualization/batching_log_notifier.py*
+%{rhn_dir}/virtualization/constants.py*
+%{rhn_dir}/virtualization/errors.py*
+%{rhn_dir}/virtualization/notification.py*
+%{rhn_dir}/virtualization/util.py*
%doc LICENSE
%files host
@@ -130,45 +118,19 @@ rm -rf $RPM_BUILD_ROOT
%dir %{rhn_conf_dir}/virt/auto
%{_initrddir}/rhn-virtualization-host
%config(noreplace) %attr(644,root,root) %{cron_dir}/rhn-virtualization.cron
-%{rhn_dir}/virtualization/domain_config.py
-%{rhn_dir}/virtualization/domain_config.pyc
-%{rhn_dir}/virtualization/domain_control.py
-%{rhn_dir}/virtualization/domain_control.pyc
-%{rhn_dir}/virtualization/domain_directory.py
-%{rhn_dir}/virtualization/domain_directory.pyc
-%{rhn_dir}/virtualization/get_config_value.py
-%{rhn_dir}/virtualization/get_config_value.pyc
-%{rhn_dir}/virtualization/init_action.py
-%{rhn_dir}/virtualization/init_action.pyc
-%{rhn_dir}/virtualization/poller.py
-%{rhn_dir}/virtualization/poller.pyc
-%{rhn_dir}/virtualization/schedule_poller.py
-%{rhn_dir}/virtualization/schedule_poller.pyc
-%{rhn_dir}/virtualization/poller_state_cache.py
-%{rhn_dir}/virtualization/poller_state_cache.pyc
-%{rhn_dir}/virtualization/start_domain.py
-%{rhn_dir}/virtualization/start_domain.pyc
-%{rhn_dir}/virtualization/state.py
-%{rhn_dir}/virtualization/state.pyc
-%{rhn_dir}/virtualization/support.py
-%{rhn_dir}/virtualization/support.pyc
-%{rhn_dir}/actions/virt.py
-%{rhn_dir}/actions/virt.pyc
-%{rhn_dir}/virtualization/domain_config.pyo
-%{rhn_dir}/virtualization/domain_control.pyo
-%{rhn_dir}/virtualization/domain_directory.pyo
-%{rhn_dir}/virtualization/get_config_value.pyo
-%{rhn_dir}/virtualization/init_action.pyo
-%{rhn_dir}/virtualization/poller.pyo
-%{rhn_dir}/virtualization/schedule_poller.pyo
-%{rhn_dir}/virtualization/poller_state_cache.pyo
-%{rhn_dir}/virtualization/start_domain.pyo
-%{rhn_dir}/virtualization/state.pyo
-%{rhn_dir}/virtualization/support.pyo
-%{rhn_dir}/virtualization/localvdsm.py
-%{rhn_dir}/virtualization/localvdsm.pyc
-%{rhn_dir}/virtualization/localvdsm.pyo
-%{rhn_dir}/actions/virt.pyo
+%{rhn_dir}/virtualization/domain_config.py*
+%{rhn_dir}/virtualization/domain_control.py*
+%{rhn_dir}/virtualization/domain_directory.py*
+%{rhn_dir}/virtualization/get_config_value.py*
+%{rhn_dir}/virtualization/init_action.py*
+%{rhn_dir}/virtualization/poller.py*
+%{rhn_dir}/virtualization/schedule_poller.py*
+%{rhn_dir}/virtualization/poller_state_cache.py*
+%{rhn_dir}/virtualization/start_domain.py*
+%{rhn_dir}/virtualization/state.py*
+%{rhn_dir}/virtualization/support.py*
+%{rhn_dir}/actions/virt.py*
+%{rhn_dir}/virtualization/localvdsm.py*
%doc LICENSE
%changelog
commit eecb04f8d669e270e307d25d398fb6e98846afa9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:07:22 2011 +0200
rhn-virtualization-host.noarch: E: non-executable-script /usr/share/rhn/virtualization/localvdsm.py 0644L /usr/bin/python
diff --git a/client/tools/rhn-virtualization/virtualization/localvdsm.py b/client/tools/rhn-virtualization/virtualization/localvdsm.py
old mode 100644
new mode 100755
commit c05ebb3ad9a3b6d1e5ba872a492dd25f6a13b6a7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:04:28 2011 +0200
rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-virtualization-host rhn-virtualization
diff --git a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
index fe5d77c..7353826 100755
--- a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
+++ b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
@@ -31,7 +31,7 @@ start() {
fi
done
- touch /var/lock/subsys/rhn-virtualization
+ touch /var/lock/subsys/rhn-virtualization-host
echo -n "Starting RHN Managed Xen Domains:"
if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
@@ -51,7 +51,7 @@ stop() {
fi
done
- rm -f /var/lock/subsys/rhn-virtualization
+ rm -f /var/lock/subsys/rhn-virtualization-host
echo -n "Stopping RHN Managed Xen Domains:"
if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
12 years, 11 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 8d54e9ce9d3bc95b85f95d802c6b7e4f102f25a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 17:26:03 2011 +0200
659138 - fix repeat-task-picker input tag
when clicking on Custom Quartz format edit, edit area doesn't stay active
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
index 4ac0c85..ce6ed6b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
@@ -60,8 +60,7 @@
<input type="radio" name="${picker.name}_status" value="cron" id="cron"
<c:if test="${picker.status == 'cron'}">checked="true"</c:if> />
- <label for="cron"><bean:message key="schedule.cron"/>:
- <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}">
+ <label for="cron"><bean:message key="schedule.cron"/>:</label>
+ <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}" />
- </label>
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.12-1'
by Michael Mraka
Tag 'spacewalk-web-1.5.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-19 09:15 +0000
Tagging package [spacewalk-web] version [1.5.12-1] in directory [web/].
Changes since spacewalk-backend-1.5.24-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [1.5.12-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 29fb160a17301cfaa7f836247ead15bb561d79c2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 11:15:36 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 0b24adf..8a6bd0d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.11-1 web/
+1.5.12-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5a88888..e63c925 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.11
+Version: 1.5.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.12-1
+- made queries PostgreSQL compatible
+
* Tue May 17 2011 Miroslav Suchý 1.5.11-1
- spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent ->
equivalent, equivalence, univalent (msuchy(a)redhat.com)
12 years, 11 months