-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Wed, 25 Mar 2009 16:54:59 +0100 Michael Mraka <michael.mr...@redhat.com> wrote:
> 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') > """) Wow somebody actually read the diffs! ;) Good catch. Add 5729894f32f02606c19d393ef4a02721a676399c to the list. - -- Devan Goodwin <dgood...@redhat.com> Software Engineer Spacewalk / RHN Satellite Halifax, Canada 650.567.9039x79267 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAknKVvAACgkQAyHWaPV9my5NKgCeLmFjOA52SeA2mHrEUOlmh/fo FA0AoLb1kdBKB2Sx7eRxFZkqW1LlpWT3 =0avb -----END PGP SIGNATURE----- _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel