2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages

Michael Mraka mmraka at fedoraproject.org
Thu Jun 28 12:16:58 UTC 2012


 backend/server/action_extra_data/solarispkgs.py |   25 +++---------------------
 backend/spacewalk-backend.spec                  |    5 +++-
 rel-eng/packages/spacewalk-backend              |    2 -
 3 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit b024aa0c90f9ab22165bdcf2285955e9d84d705d
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Thu Jun 28 14:16:23 2012 +0200

    Automatic commit of package [spacewalk-backend] release [1.8.44-1].

diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 427f0b1..1499f36 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.8.43
+Version: 1.8.44
 Release: 1%{?dist}
 URL:       https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
 
 # $Id$
 %changelog
+* Thu Jun 28 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.44-1
+- fixed AttributeError: 'buffer' object has no attribute 'write'
+
 * Thu Jun 28 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.43-1
 - Correct SQL query for installing and removing solaris patches
 - Correct query for PGSQL
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index bc314d6..51d450f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.43-1 backend/
+1.8.44-1 backend/


commit d3a474d8ea6c6045a95bdebd4e3d4f1aa699c6e7
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Thu Jun 28 14:12:42 2012 +0200

    fixed AttributeError: 'buffer' object has no attribute 'write'

diff --git a/backend/server/action_extra_data/solarispkgs.py b/backend/server/action_extra_data/solarispkgs.py
index 1051163..f43fa4e 100644
--- a/backend/server/action_extra_data/solarispkgs.py
+++ b/backend/server/action_extra_data/solarispkgs.py
@@ -42,16 +42,8 @@ _query_delete_server_action_package_result = rhnSQL.Statement("""
 _query_insert_server_action_package_result = rhnSQL.Statement("""
     insert into rhnServerActionPackageResult
            (server_id, action_package_id, result_code, stderr, stdout)
-    values (:server_id, :action_package_id, :result_code, empty_blob(),
-            empty_blob())
-""")
-
-_query_lookup_server_action_package_result = rhnSQL.Statement("""
-    select stdout, stderr
-      from rhnServerActionPackageResult
-     where server_id = :server_id
-       and action_package_id = :action_package_id
-       for update of stdout, stderr
+    values (:server_id, :action_package_id, :result_code, :stdout_data,
+            :stderr_data)
 """)
 
 def install(server_id, action_id, data={}):
@@ -89,8 +81,7 @@ def install(server_id, action_id, data={}):
     h.execute(server_id=server_id, action_id=action_id)
     
     # Insert new entries
-    h = rhnSQL.prepare(_query_insert_server_action_package_result)
-    hl = rhnSQL.prepare(_query_lookup_server_action_package_result)
+    h = rhnSQL.prepare(_query_insert_server_action_package_result, blob_map={'stdout_data': 'stdout_data', 'stderr_data': 'stderr_data'} )
     for k, (action_package_id, v) in key_id.items():
         result_code, stdout_data, stderr_data = v[:3]
         if stdout_data:
@@ -101,15 +92,7 @@ def install(server_id, action_id, data={}):
             # Nothing to do
             continue
         h.execute(server_id=server_id, action_package_id=action_package_id,
-            result_code=result_code)
-
-        hl.execute(server_id=server_id, action_package_id=action_package_id)
-        row = hl.fetchone_dict()
-        stdout, stderr = row['stdout'], row['stderr']
-        if stdout_data:
-            stdout.write(stdout_data)
-        if stderr_data:
-            stderr.write(stderr_data)
+            result_code=result_code, stdout_data=stdout_data, stderr_data=stderr_data)
 
 remove = install
 




More information about the spacewalk-commits mailing list