Devan Goodwin wrote:
% I think cherry-picking these commits would help reduce the conflicts in
% the pgsql branch:
% 
% 22fae9993b39a35f882131ce7ae5c4b9024744cf
% 
% 5e147ad535493c8209b28cb3c8d21bc1e3a78893
% 
% 9cad4715e3e3945a886f0581b1eb6f00d2468620

At first someone should fix bugs like this:
@@ -145,12 +148,11 @@ def schedule_server_packages_update(server_id, 
package_ids, org_id = None,
         'action_id' : [action_id] * len(package_ids),
         'name_id'   : package_ids,
     })
-
+#PGPORT_5:POSTGRES_VERSION_QUERY(NEXTVAL)
 _query_schedule_server_packages_update_by_arch = rhnSQL.Statement("""
     insert into rhnActionPackage (id, action_id, name_id, package_arch_id, \
            parameter)
     values (sequence_nextval('rhn_act_p_id_seq'), :action_id, :name_id, 
:arch_id, \
-           'upgrade')
 """)

% da98013f69a90571cd2080c381f0e293153527d4
% 
% 3baf10be31097917b6046899e94d919da6911542
% 
% e8a2c0466e2809583445005f9584b2b787641324
% 
% 194d681ce2a6160b55f0432cb4988e4db66f30dc
% 
% 
% Thoughts? Maybe post 0.5?
% 
% Devan

--
Michael Mráka
Satellite Engineering, Red Hat

_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to