Changes to 'refs/tags/spacewalk-utils-1.8.8-1'
by Miroslav Suchý
Tag 'spacewalk-utils-1.8.8-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-23 14:39 +0000
Tagging package [spacewalk-utils] version [1.8.8-1] in directory [utils/].
Changes since spacewalk-utils-1.8.7-1:
Miroslav Suchý (2):
813281 - fix indetation
Automatic commit of package [spacewalk-utils] release [1.8.8-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/apply_errata | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 1 month
2 commits - rel-eng/packages utils/apply_errata utils/spacewalk-utils.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-utils | 2 +-
utils/apply_errata | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f2efddda0977b6353c3c2125781aaa45a7d6c126
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 23 16:39:43 2012 +0200
Automatic commit of package [spacewalk-utils] release [1.8.8-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index d63a575..6eb8748 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.7-1 utils/
+1.8.8-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 431fedb..b9485fb 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.7
+Version: 1.8.8
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Mon Apr 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.8-1
+- 813281 - fix indetation
+
* Mon Apr 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.7-1
- 813281 - implement -n for apply_errata
commit fd03f7ddf9a1fba799dfa94cd73b15b282c6c0f6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 23 16:24:06 2012 +0200
813281 - fix indetation
diff --git a/utils/apply_errata b/utils/apply_errata
index 5bc663d..b0cab78 100755
--- a/utils/apply_errata
+++ b/utils/apply_errata
@@ -286,7 +286,7 @@ def main():
if opt['verbose']:
print "\tDeploying updates now"
command += ["-v"]
- call(command, shell=False)
+ call(command, shell=False)
client.auth.logout(session)
12 years, 1 month
Changes to 'refs/tags/spacewalk-utils-1.8.7-1'
by Miroslav Suchý
Tag 'spacewalk-utils-1.8.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-23 13:53 +0000
Tagging package [spacewalk-utils] version [1.8.7-1] in directory [utils/].
Changes since spacewalk-schema-1.8.18-1:
Miroslav Suchý (2):
813281 - implement -n for apply_errata
Automatic commit of package [spacewalk-utils] release [1.8.7-1].
Tomas Lestach (1):
815372 - prevent sending XML invalid chars in system.getScriptResults API
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 ++++++++--
rel-eng/packages/spacewalk-utils | 2 -
utils/apply_errata | 11 +++++
utils/spacewalk-utils.spec | 5 ++
4 files changed, 31 insertions(+), 6 deletions(-)
---
12 years, 1 month
rel-eng/packages utils/spacewalk-utils.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 87968df3aa18e16270bd574fc396f1d341f77e60
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 23 15:53:33 2012 +0200
Automatic commit of package [spacewalk-utils] release [1.8.7-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 2527b20..d63a575 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.6-1 utils/
+1.8.7-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 7064b09..431fedb 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.6
+Version: 1.8.7
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Mon Apr 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.7-1
+- 813281 - implement -n for apply_errata
+
* Mon Apr 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.6-1
- 812812 - make generated SSL certificate publicly available
(tlestach(a)redhat.com)
12 years, 1 month
utils/apply_errata
by Miroslav Suchý
utils/apply_errata | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 2d4ac5f8f57e1a8c03843a788eaf58eec11fe442
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 23 15:52:03 2012 +0200
813281 - implement -n for apply_errata
diff --git a/utils/apply_errata b/utils/apply_errata
index f741141..5bc663d 100755
--- a/utils/apply_errata
+++ b/utils/apply_errata
@@ -22,8 +22,9 @@
import getopt, sys, time, os, re
import xmlrpclib, httplib
from time import localtime
-from sys import argv
+from sys import argv, stdout
import getpass
+from subprocess import call
prog = sys.argv[0]
today = "%d-%d-%d" % (localtime()[2], localtime()[1], localtime()[0])
@@ -151,6 +152,7 @@ def main():
opt['proxy'] = os.environ['RHN_PROXY']
opt['verbose'] = False
+ opt['rhn_check'] = False
for o, a in opts:
if o == "-v":
opt['verbose'] = True
@@ -177,6 +179,8 @@ def main():
opt['test'] = False
if o in ("-z"):
opt['search'] = a
+ if o in ("-n"):
+ opt['rhn_check'] = True
if opt['passwd'] == '-':
opt['passwd'] = getpass.getpass()
@@ -278,6 +282,11 @@ def main():
if not opt['test']:
client.system.applyErrata(session, sid, erratum)
+ command=["/usr/sbin/rhn_check"]
+ if opt['verbose']:
+ print "\tDeploying updates now"
+ command += ["-v"]
+ call(command, shell=False)
client.auth.logout(session)
12 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java | 19 ++++++++--
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 0104135e1ff03c8bea04230d9cdc5b23e66cf297
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 23 15:48:22 2012 +0200
815372 - prevent sending XML invalid chars in system.getScriptResults API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
index 02c0e09..bb7127c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScriptResultSerializer.java
@@ -14,9 +14,12 @@
*/
package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.script.ScriptResult;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+import org.apache.commons.codec.binary.Base64;
+
import java.io.IOException;
import java.io.Writer;
@@ -35,7 +38,9 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("dateTime.iso8601", "startDate", "Time script began execution.")
* #prop_desc("dateTime.iso8601", "stopDate", "Time script stopped execution.")
* #prop_desc("int", "returnCode", "Script execution return code.")
- * #prop_desc("string", "output", "Output of the script")
+ * #prop_desc("string", "output", "Output of the script (base64 encoded according
+ to the output_enc64 attribute)")
+ * #prop_desc("boolean", "output_enc64", "Identifies base64 encoded output")
* #struct_end()
*
*/
@@ -57,8 +62,16 @@ public class ScriptResultSerializer implements XmlRpcCustomSerializer {
helper.add("startDate", scriptResult.getStartDate());
helper.add("stopDate", scriptResult.getStopDate());
helper.add("returnCode", scriptResult.getReturnCode());
- helper.add("output", scriptResult.getOutputContents());
+ String outputContents = scriptResult.getOutputContents();
+ if (StringUtil.containsInvalidXmlChars2(outputContents)) {
+ helper.add("output_enc64", Boolean.TRUE);
+ helper.add("output", new String(Base64.encodeBase64(outputContents
+ .getBytes("UTF-8")), "UTF-8"));
+ }
+ else {
+ helper.add("output_enc64", Boolean.FALSE);
+ helper.add("output", scriptResult.getOutputContents());
+ }
helper.writeTo(output);
}
-
}
12 years, 1 month
Changes to 'refs/tags/spacewalk-schema-1.8.18-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-23 08:40 +0000
Tagging package [spacewalk-schema] version [1.8.18-1] in directory [schema/spacewalk/].
Changes since spacewalk-repo-1.8-3:
Jan Pazdziora (2):
Fixing the schema hardening trigger on rhnPackageEvr.
Automatic commit of package [spacewalk-schema] release [1.8.18-1].
Tomas Lestach (1):
815252 - fix errata.listPackages APIdoc
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2 ++
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/postgres/triggers/rhnPackageEvr.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
---
12 years, 1 month
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 46539348b68e16e3a959d5566debcc1b30aa39a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 23 10:40:48 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.18-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d067ec6..27d830a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.17-1 schema/spacewalk/
+1.8.18-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 2fd1d72..77d5193 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.17
+Version: 1.8.18
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Apr 23 2012 Jan Pazdziora 1.8.18-1
+- Fixing the schema hardening trigger on rhnPackageEvr.
+
* Fri Apr 20 2012 Jan Pazdziora 1.8.17-1
- Schema hardening: catch code which would update or delete rhnPackageEvr.
- Make the records in rhnPackageUpgradeArchCompat -- no need to have
12 years, 1 month
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/triggers/rhnPackageEvr.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa376c6a61da2cf360ebf51701103316c49bc43c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 23 10:40:24 2012 +0200
Fixing the schema hardening trigger on rhnPackageEvr.
diff --git a/schema/spacewalk/postgres/triggers/rhnPackageEvr.sql b/schema/spacewalk/postgres/triggers/rhnPackageEvr.sql
index fea41f1..7286315 100644
--- a/schema/spacewalk/postgres/triggers/rhnPackageEvr.sql
+++ b/schema/spacewalk/postgres/triggers/rhnPackageEvr.sql
@@ -2,6 +2,6 @@
create trigger
rhn_pack_evr_no_updel_trig
-before insert or update on rhnPackageEvr
+before update or delete on rhnPackageEvr
execute procedure no_operation_trig_fun();
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql
index fea41f1..7286315 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/032-rhnPackageEvr-trigger.sql.postgresql
@@ -2,6 +2,6 @@
create trigger
rhn_pack_evr_no_updel_trig
-before insert or update on rhnPackageEvr
+before update or delete on rhnPackageEvr
execute procedure no_operation_trig_fun();
12 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a270170a7d35ad6daab4c0e7ba0727b75e5a6598
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Apr 23 10:22:29 2012 +0200
815252 - fix errata.listPackages APIdoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 37c2072..143289f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -683,11 +683,13 @@ public class ErrataHandler extends BaseHandler {
* #prop("string", "build_host")
* #prop("string", "description")
* #prop("string", "checksum")
+ * #prop("string", "checksum_type")
* #prop("string", "vendor")
* #prop("string", "summary")
* #prop("string", "cookie")
* #prop("string", "license")
* #prop("string", "path")
+ * #prop("string", "file")
* #prop("string", "build_date")
* #prop("string", "last_modified_date")
* #prop("string", "size")
12 years, 1 month