client/tools
by Milan Zazrivec
client/tools/spacewalk-abrt/src/bin/spacewalk-abrt | 12 +-----------
client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py | 14 ++++++++++++--
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit e2996dd63067a5cda0a6c4e53c69716d802dce8c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Feb 28 16:09:36 2013 +0100
spacewalk-abrt: remodel dump dir location logic
diff --git a/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt b/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
index 49821ae..eba2ede 100755
--- a/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
+++ b/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
@@ -26,7 +26,6 @@ t = gettext.translation('spacewalk-abrt', fallback=True)
_ = t.ugettext
from optparse import OptionGroup
-from up2date_client import config
from up2date_client import rhncli
from up2date_client import up2dateAuth
import spacewalk_abrt.abrt
@@ -51,15 +50,6 @@ class AbrtCli(rhncli.RhnCli):
_("Error: specified problem directory [%s] does not exist.\n" % path)))
sys.exit(1)
-
- def get_abrt_dir(self):
- default_abrt_dir = '/var/spool/abrt'
- if os.path.exists('/var/tmp/abrt') and os.path.isdir('/var/tmp/abrt'):
- default_abrt_dir = '/var/tmp/abrt'
- cf = config.ConfigFile('/etc/abrt/abrt.conf')
- return cf['DumpLocation'] or default_abrt_dir
-
-
def main(self):
if not (self.options.report or self.options.update_count or self.options.sync):
print _("No command specified. Use --help for more information on the usage.")
@@ -86,7 +76,7 @@ class AbrtCli(rhncli.RhnCli):
spacewalk_abrt.abrt.update_count(self.options.update_count)
if self.options.sync:
- return (spacewalk_abrt.abrt.sync(self.get_abrt_dir()))
+ return (spacewalk_abrt.abrt.sync())
sys.exit(0)
diff --git a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
index 9dc1ad9..b908f37 100644
--- a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
+++ b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
@@ -26,6 +26,7 @@ import gettext
t = gettext.translation('spacewalk-abrt', fallback=True)
_ = t.ugettext
+from up2date_client import config
from up2date_client import up2dateAuth
from up2date_client import rhnserver
from up2date_client import up2dateLog
@@ -41,6 +42,15 @@ def _readline(filepath):
else:
return None
+def _get_abrt_dir():
+ abrt_dir = '/var/tmp/abrt'
+ for directory in ['/var/tmp/abrt', '/var/spool/abrt']:
+ if os.path.exists(directory) and os.path.isdir(directory):
+ abrt_dir = directory
+
+ cf = config.ConfigFile('/etc/abrt/abrt.conf')
+ return cf['DumpLocation'] or abrt_dir
+
def report(problem_dir):
problem_dir = os.path.normpath(os.path.abspath(problem_dir))
basename = os.path.basename(problem_dir)
@@ -123,8 +133,8 @@ def update_count(problem_dir):
return 1
-def sync(abrt_dir):
- abrt_dir = os.path.normpath(abrt_dir)
+def sync():
+ abrt_dir = os.path.normpath(_get_abrt_dir())
if not (os.path.exists(abrt_dir) and os.path.isdir(abrt_dir)):
log.log_me("The specified path [%s] is not a valid directory." % abrt_dir)
return -1
11 years, 2 months
client/tools
by Milan Zazrivec
client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d19114d56c0aeab37dbb90ee33f1eb3efb68009b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Feb 28 15:59:37 2013 +0100
spacewalk-abrt: use absolute paths
diff --git a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
index d9da675..9dc1ad9 100644
--- a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
+++ b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
@@ -42,7 +42,7 @@ def _readline(filepath):
return None
def report(problem_dir):
- problem_dir = os.path.normpath(problem_dir)
+ problem_dir = os.path.normpath(os.path.abspath(problem_dir))
basename = os.path.basename(problem_dir)
log = up2dateLog.initLog()
if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
@@ -100,7 +100,7 @@ def report(problem_dir):
def update_count(problem_dir):
- problem_dir = os.path.normpath(problem_dir)
+ problem_dir = os.path.normpath(os.path.abspath(problem_dir))
basename = os.path.basename(problem_dir)
log = up2dateLog.initLog()
if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
11 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.9.42-1'
by Michael Mraka
Tag 'spacewalk-backend-1.9.42-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-28 14:41 +0000
Tagging package [spacewalk-backend] version [1.9.42-1] in directory [backend/].
Changes since spacewalk-backend-1.9.41-1:
Michael Mraka (2):
reverted --db-only removal
Automatic commit of package [spacewalk-backend] release [1.9.42-1].
Milan Zazrivec (1):
abrt: webui to set crashfile upload size
---
backend/satellite_tools/spacewalk-data-fsck | 2
backend/spacewalk-backend.spec | 5 +
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java | 26 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24 +++++++++
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 19 ++++++-
rel-eng/packages/spacewalk-backend | 2
7 files changed, 79 insertions(+), 5 deletions(-)
---
11 years, 2 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/spacewalk-data-fsck | 2 ++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 4f4543bea03d76f187e558530566ccd5c20e3326
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 28 15:41:08 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.42-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 59a119e..18d2157 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.41
+Version: 1.9.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Feb 28 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.42-1
+- reverted --db-only removal
+
* Thu Feb 28 2013 Jan Pazdziora 1.9.41-1
- Initialize the CFG, in case the caller did not do it for us.
- Using the correct configuration value for database name.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2ac0f66..991d409 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.41-1 backend/
+1.9.42-1 backend/
commit bc89e7da62f1c73424991ae6fa8f1880b533e7d3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 28 15:37:04 2013 +0100
reverted --db-only removal
not every option starts with --db has anything to do with initDB()
partial revert of 9e12586842ed04852aa5c09ea1f5c85309a902af
diff --git a/backend/satellite_tools/spacewalk-data-fsck b/backend/satellite_tools/spacewalk-data-fsck
index 4d0cf53..f99dd0f 100755
--- a/backend/satellite_tools/spacewalk-data-fsck
+++ b/backend/satellite_tools/spacewalk-data-fsck
@@ -283,6 +283,8 @@ if __name__ == '__main__':
help="Don't check package checksum"),
Option("-O", "--no-nevrao", action="store_false", dest="nevrao", default=True,
help="Don't check package name, epoch, version, release, arch, org"),
+ Option("-d", "--db-only", action="store_true",
+ help="Check only if packages from database are present on filesystem"),
Option("-f", "--fs-only", action="store_true",
help="Check only if packages from filesystem are in the database"),
Option("-r", "--remove", action="store_true",
11 years, 2 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java | 26 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24 +++++++++
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 19 ++++++-
4 files changed, 72 insertions(+), 3 deletions(-)
New commits:
commit 892dbe8f0819537d37586fed0f5fcba45c94aa8c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Feb 28 14:18:21 2013 +0100
abrt: webui to set crashfile upload size
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
index 8453667..78cbd9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
@@ -14,10 +14,14 @@
*/
package com.redhat.rhn.frontend.action.multiorg;
+import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.struts.RhnValidationHelper;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,6 +49,28 @@ public class OrgConfigAction extends RhnAction {
if (ctx.isSubmitted()) {
org.setStagingContentEnabled(request.
getParameter("staging_content_enabled") != null);
+
+ Long newLimit = null;
+ try {
+ newLimit = Long.parseLong(
+ request.getParameter("crashfile_sizelimit").trim());
+
+ if (newLimit < 0) {
+ throw new IllegalArgumentException();
+ }
+ }
+ catch (IllegalArgumentException ex) {
+ ValidatorError error = new ValidatorError("orgsizelimit.invalid");
+ getStrutsDelegate().saveMessages(request,
+ RhnValidationHelper.validatorErrorToActionErrors(error));
+
+ return getStrutsDelegate().forwardParam(mapping.findForward("error"),
+ RequestContext.ORG_ID, org.getId().toString());
+ }
+ if (StringUtils.isNotEmpty(request.getParameter("crashfile_sizelimit"))) {
+ org.setCrashFileSizelimit(newLimit);
+ }
+
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("message.org_name_updated", org.getName()));
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index e2153ee..d4f0a16 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -6684,6 +6684,12 @@ Follow this url to see the full list of inactive systems:
<context context-type="sourcefile">/rhn/systems/details/SystemChannels.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="orgsizelimit.invalid">
+ <source>Size limit modification must be a valid non negative number.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="orgsystemsubs.invalid">
<source>Entitlement modification must be a valid number for {0}.</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 5f2c1c7..93abeb8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -3255,6 +3255,18 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/admin/multiorg/OrgDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="orgconfig.jsp.header">
+ <source>Organization Configuration</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="orgconfig.jsp.description">
+ <source>Below you configure your organization to use staging content and set up the upload size limit for a crash file. The upload limit is a non negative number. Zero means no limit.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="org.name.jsp">
<source>Organization Name</source>
<context-group name="ctx">
@@ -3285,6 +3297,18 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="org-config.crashfile-sizelimit.jsp">
+ <source>Crash File Upload Size Limit</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="org-config.sizelimit-hint.jsp">
+ <source>Enter the limit size in bytes. Zero means no limit.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="org.id.jsp">
<source>Organization ID</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index d2a588f..5603cd8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -41,8 +41,9 @@
<rhn:csrf />
<rhn:submitted/>
<input type="hidden" name="oid" value="${param.oid}"/>
- <h2><bean:message key="orgdetails.jsp.header"/></h2>
-
+ <h2><bean:message key="orgconfig.jsp.header"/></h2>
+ <bean:message key="orgconfig.jsp.description"/>
+ <p/>
<table class="details" align="center">
<tr>
<th><label for="staging_content_enabled"><bean:message key="org-config.staging-content.jsp"/></th>
@@ -54,16 +55,28 @@
/>
</td>
</tr>
+ <tr>
+ <th>
+ <bean:message key="org-config.crashfile-sizelimit.jsp"/>
+ </th>
+ <td>
+ <input type="number"
+ name="crashfile_sizelimit"
+ value="${org.crashFileSizelimit}"
+ id="crashfile_sizelimit" />
+ <td>
+ </tr>
</table>
<div align="right">
<hr/>
+
<html:submit>
<bean:message key="orgdetails.jsp.submit"/>
</html:submit>
+
</div>
</form>
-
</body>
</html:html>
11 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.9.41-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.41-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-28 12:18 +0000
Tagging package [spacewalk-backend] version [1.9.41-1] in directory [backend/].
Changes since spacecmd-1.9.2-1:
Jan Pazdziora (3):
Using the correct configuration value for database name.
Initialize the CFG, in case the caller did not do it for us.
Automatic commit of package [spacewalk-backend] release [1.9.41-1].
---
backend/server/rhnSQL/__init__.py | 5 +++--
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
---
11 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0b560d16e7e77a43c7ba1d03225299388f59863f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Feb 28 13:18:15 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 994ecf7..59a119e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.40
+Version: 1.9.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Feb 28 2013 Jan Pazdziora 1.9.41-1
+- Initialize the CFG, in case the caller did not do it for us.
+- Using the correct configuration value for database name.
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Thu Feb 28 2013 Jan Pazdziora 1.9.40-1
- Fixing empty method body.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e3330f5..2ac0f66 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.40-1 backend/
+1.9.41-1 backend/
11 years, 2 months
2 commits - backend/server
by Jan Pazdziora
backend/server/rhnSQL/__init__.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b3123ae70bfaf8bbc734bc7892c65bb8999ff61b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Feb 28 13:17:19 2013 +0100
Initialize the CFG, in case the caller did not do it for us.
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index 3cc9176..5b03dbf 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -18,7 +18,7 @@
import sys
from spacewalk.common.rhnLog import log_debug
-from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.common.rhnException import rhnException
from spacewalk.common.rhnTB import add_to_seclist
@@ -81,6 +81,7 @@ def initDB(backend=None, host=None, port=None, username=None,
"""
if backend is None:
+ initCFG('server')
backend = CFG.DB_BACKEND
host = CFG.DB_HOST
port = CFG.DB_PORT
commit 7e52f7c91979c95ef828e7aa8036d95ff5c368d2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Feb 28 12:54:45 2013 +0100
Using the correct configuration value for database name.
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index 3d2ac54..3cc9176 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -84,7 +84,7 @@ def initDB(backend=None, host=None, port=None, username=None,
backend = CFG.DB_BACKEND
host = CFG.DB_HOST
port = CFG.DB_PORT
- database = CFG.DB_DATABASE
+ database = CFG.DB_NAME
username = CFG.DB_USER
password = CFG.DB_PASSWORD
11 years, 2 months
Changes to 'refs/tags/spacecmd-1.9.2-1'
by Michael Mraka
Tag 'spacecmd-1.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-28 11:24 +0000
Tagging package [spacecmd] version [1.9.2-1] in directory [spacecmd/].
Changes since spacewalk-backend-1.9.40-1:
Jan Pazdziora (3):
Purging %changelog entries preceding Spacewalk 1.0, in active packages.
The schema-updater has been obsoleted by spacewalk-schema-upgrade.
Quote the password we pass to sqlplus so that special characters can be used.
Michael Mraka (2):
fixing broken export of configchannels with symlinks
Automatic commit of package [spacecmd] release [1.9.2-1].
---
backend/spacewalk-backend.spec | 1185 -------
branding/spacewalk-branding.spec | 104
client/rhel/rhn-client-tools/rhn-client-tools.spec | 783 ----
client/rhel/rhnlib/rhnlib.spec | 204 -
client/rhel/rhnsd/rhnsd.spec | 104
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 276 -
client/tools/osad/osad.spec | 145
client/tools/rhn-kickstart/rhn-kickstart.spec | 153
client/tools/rhn-virtualization/rhn-virtualization.spec | 114
client/tools/rhncfg/rhncfg.spec | 114
client/tools/rhncustominfo/rhn-custom-info.spec | 39
client/tools/rhnpush/rhnpush.spec | 90
client/tools/spacewalk-koan/spacewalk-koan.spec | 74
java/spacewalk-java.spec | 1585 ----------
monitoring/MessageQueue/MessageQueue.spec | 21
monitoring/NOCpulsePlugins/NOCpulsePlugins.spec | 33
monitoring/NPalert/NPalert.spec | 80
monitoring/PerlModules/NP/Debug/perl-NOCpulse-Debug.spec | 35
monitoring/PerlModules/NP/Gritch/perl-NOCpulse-Gritch.spec | 23
monitoring/PerlModules/NP/Object/perl-NOCpulse-Object.spec | 20
monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec | 24
monitoring/PerlModules/NP/PersistentConnection/perl-NOCpulse-PersistentConnection.spec | 11
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 41
monitoring/PerlModules/NP/ProcessPool/perl-NOCpulse-ProcessPool.spec | 13
monitoring/PerlModules/NP/Utils/perl-NOCpulse-Utils.spec | 28
monitoring/SatConfig/SNMPAlerts/SNMPAlerts.spec | 11
monitoring/SatConfig/bootstrap-server/SatConfig-bootstrap-server.spec | 11
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 22
monitoring/SatConfig/general/SatConfig-general.spec | 63
monitoring/SatConfig/generator/SatConfig-generator.spec | 18
monitoring/SputLite/SputLite.spec | 38
monitoring/eventReceivers/eventReceivers.spec | 22
monitoring/nocpulse-common/nocpulse-common.spec | 107
monitoring/nocpulse-db-perl/nocpulse-db-perl.spec | 11
monitoring/rhnmd/rhnmd.spec | 66
monitoring/scdb/scdb.spec | 11
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 41
monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec | 64
monitoring/status_log_acceptor/status_log_acceptor.spec | 12
monitoring/tsdb/tsdb.spec | 34
projects/oracle-lib-compat/oracle-lib-compat.spec | 51
projects/oracle-server-admin/oracle-server-admin.spec | 14
projects/oracle-server-scripts/oracle-server-scripts.spec | 75
projects/perl-Satcon/perl-Satcon.spec | 23
projects/python-gzipstream/python-gzipstream.spec | 40
projects/ssl-cert-check/spacewalk-ssl-cert-check.spec | 31
proxy/installer/spacewalk-proxy-installer.spec | 196 -
proxy/proxy/spacewalk-proxy.spec | 421 --
rel-eng/git-untagged-commits.pl | 2
rel-eng/packages/spacecmd | 2
reporting/spacewalk-reports.spec | 16
schema/spacewalk/spacewalk-schema.spec | 405 --
schema/spacewalk/spacewalk-sql | 2
scripts/schema-updater | 66
search-server/spacewalk-search/spacewalk-search.spec | 144
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 60
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 52
selinux/oracle-selinux/oracle-selinux.spec | 103
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 57
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 90
selinux/spacewalk-selinux/spacewalk-selinux.spec | 100
spacecmd/spacecmd.spec | 5
spacecmd/src/lib/configchannel.py | 38
spacewalk/admin/spacewalk-admin.spec | 144
spacewalk/certs-tools/spacewalk-certs-tools.spec | 114
spacewalk/config/spacewalk-config.spec | 172 -
spacewalk/package/spacewalk.spec | 92
spacewalk/setup/spacewalk-setup.spec | 351 --
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 3
utils/spacewalk-utils.spec | 50
web/spacewalk-web.spec | 472 --
71 files changed, 27 insertions(+), 9194 deletions(-)
---
11 years, 2 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Michael Mraka
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/configchannel.py | 38 ++++++++++++++++++++------------------
3 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 009c0a9b612429fe39f3d4f3127117048316e2a6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 28 12:24:34 2013 +0100
Automatic commit of package [spacecmd] release [1.9.2-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 5c7eb1f..a7c85e0 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.9.1-1 spacecmd/
+1.9.2-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 8a0fcb6..0ab4555 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.9.1
+Version: 1.9.2
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
+* Thu Feb 28 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.2-1
+- fixing broken export of configchannels with symlinks
+
* Mon Feb 18 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.1-1
- sort export_kickstart_getdetails right after fetching
- Bumping package versions for 1.9.
commit 451b46efbbe2870a12ff68a6bd83af9b685c143d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 28 12:15:54 2013 +0100
fixing broken export of configchannels with symlinks
see
https://www.redhat.com/archives/spacewalk-devel/2013-February/msg00018.html
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 36ea376..02fba9d 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -845,25 +845,7 @@ def export_configchannel_getdetails(self, channel):
# string "macro-start-delimiter" Y N
# string "macro-end-delimiter" Y N
for f in fileinfo:
- # If we're using a recent API version files exported with no contents
- # i.e binary or non-xml encodable ascii files can be exported as
- # base64 encoded
- if not f.has_key('contents'):
- if not self.check_api_version('11.1'):
- logging.warning("File %s could not be exported " % f['path'] +\
- "with this API version(needs base64 encoding)")
- else:
- logging.info("File %s could not be exported as" % f['path'] +\
- " text...getting base64 encoded version")
- b64f = self.client.configchannel.getEncodedFileRevision(\
- self.session, channel, f['path'], f['revision'])
- f['contents'] = b64f['contents']
- f['contents_enc64'] = b64f['contents_enc64']
- for k in [ 'channel', 'revision', 'creation', 'modified', \
- 'permissions_mode', 'binary', 'md5' ]:
- if f.has_key(k):
- del f[k]
if f['type'] == 'symlink':
for k in [ 'contents', 'owner', 'group', 'permissions', \
'macro-start-delimiter', 'macro-end-delimiter' ]:
@@ -874,6 +856,26 @@ def export_configchannel_getdetails(self, channel):
del f['target_path']
f['permissions'] = str(f['permissions'])
+ # If we're using a recent API version files exported with no contents
+ # i.e binary or non-xml encodable ascii files can be exported as
+ # base64 encoded
+ if not f.has_key('contents'):
+ if not self.check_api_version('11.1'):
+ logging.warning("File %s could not be exported " % f['path'] +\
+ "with this API version(needs base64 encoding)")
+ else:
+ logging.info("File %s could not be exported as" % f['path'] +\
+ " text...getting base64 encoded version")
+ b64f = self.client.configchannel.getEncodedFileRevision(\
+ self.session, channel, f['path'], f['revision'])
+ f['contents'] = b64f['contents']
+ f['contents_enc64'] = b64f['contents_enc64']
+
+ for k in [ 'channel', 'revision', 'creation', 'modified', \
+ 'permissions_mode', 'binary', 'md5' ]:
+ if f.has_key(k):
+ del f[k]
+
details['files'] = fileinfo
return details
11 years, 2 months