Branch 'SPACEWALK-1.9' - 2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages

[Jan Pazdziora]

 backend/satellite_tools/disk_dumper/iss.py |    2 +-
 backend/spacewalk-backend.spec             |    5 ++++-
 rel-eng/packages/spacewalk-backend         |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4d01f809d3cf3e3856c3f511ece9e3205720153f
Author: Jan Pazdziora <jpazdziora(a)redhat.com&gt;
Date:   Thu Mar 28 15:24:26 2013 +0100

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

diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 82a0744..4834f00 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.47
+Version: 1.9.48
 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 Mar 28 2013 Jan Pazdziora 1.9.48-1
+- fixing column name in postgresql
+
 * Wed Mar 13 2013 Stephen Herr <sherr(a)redhat.com&gt; 1.9.47-1
 - Properly check the self.port which can be None by now.
 - The is_connected_to needs to match the adjustments we do in connect.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 35a3712..10abe46 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.47-1 backend/
+1.9.48-1 backend/


commit 1c1a2688f8baf3705705dab7b10ac0c210bcd886
Author: Michael Mraka <michael.mraka(a)redhat.com&gt;
Date:   Wed Mar 20 12:06:16 2013 +0100

    fixing column name in postgresql
    
    fixing
    SQLStatementPrepareError caught while getting kickstart files info.
    *** SQLStatementPrepareError: ('syntax error at or near "label"\nLINE
7:
    rkt.label label,\n ', 0, '\n                    select
    rktf.relative_filename "relative-path",\n
    ...
    (cherry picked from commit 9398a2e5586c773608bc92cfa64d36856bc3011b)

diff --git a/backend/satellite_tools/disk_dumper/iss.py
b/backend/satellite_tools/disk_dumper/iss.py
index 95005c3..2ad364e 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -533,7 +533,7 @@ class Dumper(dumper.XML_Dumper):
                            rktf.file_size "file-size",
                            TO_CHAR(rktf.last_modified, 'YYYYMMDDHH24MISS')
"last-modified",
                            rkt.base_path "base-path",
-                           rkt.label label,
+                           rkt.label "label",
                            TO_CHAR(rkt.modified, 'YYYYMMDDHH24MISS')
"modified"
                       from rhnKSTreeFile rktf, rhnKickstartableTree rkt,
                            rhnChecksumView c