schema/spacewalk scripts/update_symlinks.py

[Justin Sherrill]

schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
|    2 +-
 scripts/update_symlinks.py                                                               
         |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 26151497cef7820cdbbd7e96b5727c55b1c7ea28
Author: Justin Sherrill <jsherril(a)redhat.com&gt;
Date:   Thu Jul 29 17:44:47 2010 -0400

    fixing a few things with the new config changes for symlinks

diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
index 5ab5e92..03b4e8d 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/101-update-config-schema.sql
@@ -43,7 +43,7 @@ BEGIN
   END LOOP;
   commit;
 END;
-
+/
 
 alter table rhnConfigContent modify delim_start   not null;
 alter table rhnConfigContent modify delim_end     not null;
diff --git a/scripts/update_symlinks.py b/scripts/update_symlinks.py
index 872257b..bc49e2d 100644
--- a/scripts/update_symlinks.py
+++ b/scripts/update_symlinks.py
@@ -71,10 +71,12 @@ def main():
             where 
             cr.CONFIG_FILE_TYPE_ID in (select id from rhnConfigFileType where
label='symlink')"""
     h = rhnSQL.prepare(q)
-    if h.execute() == 0:
-        return 
+    h.execute()
+    results = h.fetchall_dict()
+    if not results:
+        return
     contents = []
-    for row in h.fetchall_dict():
+    for row in results:
         contents.append( dict(revision_id = row["rev_id"],
                     file_id = row ["file_id"],
                    info_id = row ["info_id"],