java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit aca22751e19b0c7946da68bcff9d56343615db16
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 30 17:25:44 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.138-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ac2915d..2ec664b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.137
+Version: 1.8.138
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.138-1
+- 851150 - make the select working on PG as well
+
* Thu Aug 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.137-1
- 851480 - Do not elaborate objects twice in row.
- 851480 - Revert "bz: 453477: duplicated entries in CSV download for some
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6fa05c3..92a6b16 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.137-1 java/
+1.8.138-1 java/
11 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 05be4a6f4d509e55dcc9ef21d5a763ebf37f41d1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 30 13:50:52 2012 +0200
851150 - make the select working on PG as well
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 60a6cfb..1bf7e32 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -507,6 +507,7 @@ ORDER BY rhn_channel.channel_priority(ACh.parent_or_self_id), ACh.parent_or_sel
<mode name="all_channels_tree">
<query params="user_id">
SELECT distinct C.name,
+ UPPER(C.name),
UC.channel_id ID,
PC.label PARENT_CHANNEL,
C.label,
11 years, 8 months
Changes to 'refs/tags/rhn-client-tools-1.8.19-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.8.19-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-08-30 09:02 +0000
Tagging package [rhn-client-tools] version [1.8.19-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.8.137-1:
Miroslav Suchý (2):
workaround missing python-ethtool
Automatic commit of package [rhn-client-tools] release [1.8.19-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 12 +++++++++++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
---
11 years, 8 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 12 +++++++++++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 916ebb26ac5ac84d3e8543991470433f92fe825f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 30 11:02:36 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.19-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 45b980d..af98b92 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.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: rhn-client-tools
-Version: 1.8.18
+Version: 1.8.19
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Aug 30 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.19-1
+- workaround missing python-ethtool
+
* Thu Aug 02 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.18-1
- registerUser is dead since b27c6ad4b90a6c4c3f970fc0f8faefae7c134c9c
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 021e5d3..8661818 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.18-1 client/rhel/rhn-client-tools/
+1.8.19-1 client/rhel/rhn-client-tools/
commit 8baef61c8b6b9564e7e936f52575d5eb75b5ee38
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 30 10:53:01 2012 +0200
workaround missing python-ethtool
On Debian/kfreebsd is not available python-ethtoool. It is because it requires libnl,
which is Linux specific.
So if python-ethtools is not present, do not fail and just print warning,
that hardware information about network interfaces are not present.
And read_network_interfaces() will return empty dictionary.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 6e4300c..ba53256 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -22,7 +22,13 @@ import os
import sys
import config
-import ethtool
+try:
+ import ethtool
+ ethtool_present = True
+except ImportError:
+ sys.stderr.write("Warning: information about network interfaces could not be retrieved on this platform.\n")
+ ethtool_present = False
+
import gettext
t = gettext.translation('rhn-client-tools', fallback=True)
_ = t.ugettext
@@ -524,6 +530,10 @@ def read_network_interfaces():
intDict = {}
intDict['class'] = "NETINTERFACES"
+ if not ethtool_present:
+ # ethtool is not available on non-linux platforms (as kfreebsd), skip it
+ return intDict
+
interfaces = list(set(ethtool.get_devices() + ethtool.get_active_devices()))
for interface in interfaces:
try:
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.137-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.137-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-08-30 08:29 +0000
Tagging package [spacewalk-java] version [1.8.137-1] in directory [java/].
Changes since spacecmd-1.8.14-1:
Miroslav Suchý (1):
package spacewalk-setup-jabberd is now in Fedora
Simon Lukasik (2):
851480 - Revert "bz: 453477: duplicated entries in CSV download for some fields"
851480 - Do not elaborate objects twice in row.
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.8.137-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 30 ++++++++--
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 21 -------
java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java | 12 ++++
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 26 +++++++-
java/spacewalk-java.spec | 12 +++-
rel-eng/packages/spacewalk-java | 2
rel-eng/push-packages-to-fedora.sh | 2
7 files changed, 74 insertions(+), 31 deletions(-)
---
11 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit cc8d0e9f36e2258bb0bcc5cbcd52423cf6153a78
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 30 10:29:12 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.137-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 319696b..ac2915d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.136
+Version: 1.8.137
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.137-1
+- 851480 - Do not elaborate objects twice in row.
+- 851480 - Revert "bz: 453477: duplicated entries in CSV download for some
+ fields"
+- allow complex kickstart variables containing severel '='
+- 851519 - display a reasonable error message on the permission error page
+- Fixing test KickstartScheduleCommandTest.testProfileArches
+- fix ContentSourceFilter.findBySourceId to return list of ContentSourceFilter
+ objects
+
* Tue Aug 28 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.136-1
- add listRepoFilters API call
- add lookupContentSourceFiltersById method to ChannelFactory
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 68e2557..6fa05c3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.136-1 java/
+1.8.137-1 java/
11 years, 8 months
2 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 30 ++++++++--
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 21 -------
java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java | 12 ++++
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 26 +++++++-
4 files changed, 61 insertions(+), 28 deletions(-)
New commits:
commit fb05a2cc003088aba405718f551915ea92ab6eef
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 28 16:45:48 2012 +0200
851480 - Do not elaborate objects twice in row.
This fixes bug 453477 more properly.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 477bcc1..1b2cfa4 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -76,6 +76,7 @@ public class CachedStatement {
// This is only set if the current CachedStatement is a duplicate of an
// existing one with the %s expanded out.
private CachedStatement parentStatement;
+ private List restartData = null;
// We could (and probably should) cache the ResultSet metadata here as
// well. There is no reason that the first call to each statement
@@ -437,6 +438,7 @@ public class CachedStatement {
// returning an Object and letting the caller do the casting for us.
private Object execute(String sql, Map parameterMap,
Map parameters, Mode mode, List dr) {
+ storeForRestart(sql, parameterMap, parameters, mode, dr);
PreparedStatement ps = null;
try {
Connection conn = stealConnection();
@@ -861,5 +863,28 @@ public class CachedStatement {
conn = session.connection();
return conn;
}
+
+ private void storeForRestart(String sql, Map parameterMap,
+ Map parameters, Mode mode, List dr) {
+ restartData = new ArrayList();
+ restartData.add(sql);
+ restartData.add(parameterMap);
+ restartData.add(parameters);
+ restartData.add(mode);
+ restartData.add(dr);
+ }
+
+ /**
+ * Restart the latest query
+ * @return what the previous query returned or null.
+ */
+ public Object restartQuery() {
+ return restartData == null ? null :
+ execute((String) restartData.get(0),
+ (Map) restartData.get(1),
+ (Map) restartData.get(2),
+ (Mode) restartData.get(3),
+ (List) restartData.get(4));
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
index 6cd56e0..3b20f09 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/CSVDownloadAction.java
@@ -14,6 +14,8 @@
*/
package com.redhat.rhn.frontend.action;
+import com.redhat.rhn.common.db.datasource.CachedStatement;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.Elaborator;
import com.redhat.rhn.common.util.CSVWriter;
import com.redhat.rhn.common.util.download.ByteArrayStreamInfo;
@@ -47,6 +49,7 @@ import javax.servlet.http.HttpSession;
public class CSVDownloadAction extends DownloadAction {
public static final String EXPORT_COLUMNS = "__CSV__exportColumnsParam";
public static final String PAGE_LIST_DATA = "___CSV_pageListData";
+ public static final String QUERY_DATA = "__CSV_queryMode";
public static final String UNIQUE_NAME = "__CSV_uniqueName";
public static final String HEADER_NAME = "__CSV_headerName";
@@ -106,6 +109,15 @@ public class CSVDownloadAction extends DownloadAction {
*/
protected List getPageData(HttpServletRequest request, HttpSession session)
throws Exception {
+ String paramQuery = request.getParameter(QUERY_DATA);
+ if (paramQuery != null) {
+ CachedStatement query = (CachedStatement) session.getAttribute(paramQuery);
+ if (query == null) {
+ throw new Exception("Missing request parameter, " + QUERY_DATA);
+ }
+ return (DataResult) query.restartQuery();
+ }
+
String paramPageData = request.getParameter(PAGE_LIST_DATA);
if (null == paramPageData) {
throw new Exception("Missing request parameter, " + EXPORT_COLUMNS);
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
index 30570ce..5d737a9 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.taglibs.list;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.action.CSVDownloadAction;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
@@ -208,7 +209,6 @@ public class CSVTag extends BodyTagSupport {
*/
public String makeCSVRequestParams() {
String paramExportColumns = "exportColumns_" + getUniqueName();
- String paramPageList = "pageList_" + getUniqueName();
String paramHeader = "header_" + getUniqueName();
HttpServletRequest request = (HttpServletRequest) pageContext
.getRequest();
@@ -216,11 +216,10 @@ public class CSVTag extends BodyTagSupport {
// exportColumns and pageData __must__ be in session context
// so CSVDownloadAction is able to retreive them.
session.setAttribute(paramExportColumns, exportColumns);
- session.setAttribute(paramPageList, pageData);
String csvKey =
CSVDownloadAction.EXPORT_COLUMNS + "=" + paramExportColumns +
- "&" + CSVDownloadAction.PAGE_LIST_DATA + "=" + paramPageList +
+ "&" + exportDataToSession(session) +
"&" + CSVDownloadAction.UNIQUE_NAME + "=" + getUniqueName();
if (header != null) {
@@ -231,4 +230,25 @@ public class CSVTag extends BodyTagSupport {
return csvKey;
}
+ private String exportDataToSession(HttpSession session) {
+ if (pageData != null && pageData instanceof DataResult &&
+ ((DataResult)pageData).getMode() != null &&
+ ((DataResult)pageData).getMode().getQuery() != null) {
+ /* We better do not export pageList, let's keep the query instead.
+ * 1) Query is usually smaller than data. And since this never gets deleted
+ * from session, the session data doesn't grow that rapidly.
+ * 2) Part of the pageList might be already elaborated and we cannot say
+ * which (consider filters, alfphabar, pagination, and sorting).
+ * Repeated elaboration isn't great thing; bug 453477, 851480, 445895
+ */
+ String paramQuery = "query_" + getUniqueName();
+ session.setAttribute(paramQuery, ((DataResult)pageData).getMode().getQuery());
+ return CSVDownloadAction.QUERY_DATA + "=" + paramQuery;
+ }
+ else {
+ String paramPageList = "pageList_" + getUniqueName();
+ session.setAttribute(paramPageList, pageData);
+ return CSVDownloadAction.PAGE_LIST_DATA + "=" + paramPageList;
+ }
+ }
}
commit 1f887b97fd27f1ac770a11fea7e445f0a8755e77
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Aug 29 17:36:37 2012 +0200
851480 - Revert "bz: 453477: duplicated entries in CSV download for some fields"
This reverts commit a0200a462868a25ea36790c7dd6725b8c047ac6c.
Conflicts:
java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index a5d3852..477bcc1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -736,10 +736,7 @@ public class CachedStatement {
if (c == null) {
c = new ArrayList();
}
- Object item = getObject(rs, columnName);
- if (!c.contains(item)) {
- c.add(item);
- }
+ c.add(getObject(rs, columnName));
MethodUtil.callMethod(obj, setName, c);
continue;
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index d3ff272..c740c1f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -26,7 +26,6 @@ import com.redhat.rhn.common.hibernate.HibernateHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.TestUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.hibernate.Session;
@@ -292,26 +291,6 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
}
}
- public void testDoubleElaboration() throws Exception {
- if (ConfigDefaults.get().isOracle()) {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
- DataResult<TableData> dr = m.execute(Collections.EMPTY_MAP);
- assertTrue(dr.size() >= 1);
- dr.elaborate();
- TableData rowA = dr.get(0);
- String tableNameA = rowA.getTableName();
- String columnNameA = StringUtils.join(rowA.getColumnName().iterator(), ",");
- // Elaborate 2nd time
- dr.elaborate();
- TableData rowB = dr.get(0);
- String tableNameB = rowB.getTableName();
- String columnNameB = StringUtils.join(rowB.getColumnName().iterator(), ",");
-
- assertEquals(tableNameA, tableNameB);
- assertEquals(columnNameA, columnNameB);
- }
- }
-
public void testMaxRowsWithElaboration() throws Exception {
int startId = 1000;
int endId = startId + 50;
11 years, 8 months
rel-eng/push-packages-to-fedora.sh
by Miroslav Suchý
rel-eng/push-packages-to-fedora.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dc17a235cf4d70f1509b1450aee227a98eb55569
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 30 10:01:03 2012 +0200
package spacewalk-setup-jabberd is now in Fedora
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh
index 8ae06a7..21c89ba 100755
--- a/rel-eng/push-packages-to-fedora.sh
+++ b/rel-eng/push-packages-to-fedora.sh
@@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1
# top dir of spacewalk git checkout
TOP_DIR_GIT=$2
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream spacewalk-web spacewalk-admin"
+PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream spacewalk-web spacewalk-admin spacewalk-setup-jabberd"
if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then
11 years, 8 months
Changes to 'refs/tags/spacecmd-1.8.14-1'
by aparsons
Tag 'spacecmd-1.8.14-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2012-08-29 15:50 +0000
Tagging package [spacecmd] version [1.8.14-1] in directory [spacecmd/].
Changes since osad-5.11.5-1:
Aron Parsons (2):
spacecmd: prevent outputting escape sequences to non-terminals
Automatic commit of package [spacecmd] release [1.8.14-1].
Tomas Lestach (2):
851519 - display a reasonable error message on the permission error page
allow complex kickstart variables containing severel '='
---
java/code/src/com/redhat/rhn/common/security/PermissionException.java | 2 +-
java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2 +-
java/code/webapp/WEB-INF/struts-config.xml | 2 +-
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/bin/spacecmd | 9 ++++++++-
6 files changed, 16 insertions(+), 6 deletions(-)
---
11 years, 8 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/bin/spacecmd | 9 ++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 3c821a643a05992055b917543d8eba8e5be14ea8
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Wed Aug 29 11:50:22 2012 -0400
Automatic commit of package [spacecmd] release [1.8.14-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index cf6e61f..4decffa 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.8.13-1 spacecmd/
+1.8.14-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 78c6caa..4725e61 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.8.13
+Version: 1.8.14
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -60,6 +60,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Wed Aug 29 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.14-1
+- spacecmd: prevent outputting escape sequences to non-terminals
+
* Sun Aug 12 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.13-1
- spacecmd: add system_schedule{hardware,package}refresh functions Signed-off-
by: Aron Parsons <aronparsons(a)gmail.com>
commit 90b55fb528bfd7b00556445010dea62a22f58899
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Wed Aug 29 11:49:47 2012 -0400
spacecmd: prevent outputting escape sequences to non-terminals
diff --git a/spacecmd/src/bin/spacecmd b/spacecmd/src/bin/spacecmd
index 29970ab..9094ce9 100755
--- a/spacecmd/src/bin/spacecmd
+++ b/spacecmd/src/bin/spacecmd
@@ -24,7 +24,6 @@
import logging, os, re, sys, xmlrpclib
from ConfigParser import SafeConfigParser, NoOptionError
from optparse import Option, OptionParser
-from spacecmd.shell import SpacewalkShell
_INTRO = '''Welcome to spacecmd, a command-line interface to Spacewalk.
@@ -78,6 +77,14 @@ if __name__ == '__main__':
# server-specifics will be loaded from the configuration file later
config = SafeConfigParser()
+ # prevent readline from outputting escape sequences to non-terminals
+ if not sys.stdout.isatty():
+ logging.debug('stdout is not a TTY, setting TERM=dumb')
+ os.environ['TERM'] = 'dumb'
+
+ # import our Cmd subclass after we settle our TERM value
+ from spacecmd.shell import SpacewalkShell
+
# create an instance of the shell
shell = SpacewalkShell(options, conf_dir, config)
11 years, 8 months