5 commits - backend/server client/rhel
by Šimon Lukašík
backend/server/action_extra_data/scap.py | 3 ---
client/rhel/spacewalk-oscap/scap.py | 15 ++++++---------
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 1a2f2ebff0a5f69337d718c81e32101ee7861dcc
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Feb 28 16:30:11 2012 +0100
Do not unlink file, tempfile will do that automatically.
Enforce destructor instead.
Addressing:
Exception exceptions.OSError: (2, 'No such file or directory', '/tmp/tmpRNALDd') in <bound method _TemporaryFileWrapper.__del__ of <closed file '<fdopen>', mode 'w+b' at 0x9c07ba8>> ignored
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index d9994f9..ec93248 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -1,5 +1,4 @@
-import os
import sys
import subprocess
import xml.sax
@@ -23,7 +22,7 @@ def xccdf_eval(args, cache_only=None):
return (1, 'oscap tool did not produce valid xml.', {})
ret, resume, xslt_err = _xccdf_resume(results_file.name)
- os.unlink(results_file.name)
+ del(results_file)
if ret != 0 or resume == '':
return (1, 'Problems with extracting resume:\n' + xslt_err, {})
return (0, 'openscap scan completed', {
commit 43ed18ffc829a7dbf791d18f45e043ff5e664a0a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Feb 28 16:16:08 2012 +0100
This module is not supposed to be used as a stand-alone script.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 773a7b8..d9994f9 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -66,8 +66,3 @@ def _assert_xml(filename):
finally:
f.close()
-if __name__ == "__main__":
- print xccdf_eval({
- 'params': '--profile united_states_government_configuration_baseline',
- 'path': 'usgcb-rhel5desktop-xccdf.xml'
- })
commit 4be31138685e1d0f36a556d70048b1c88ecadb77
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Feb 28 16:03:59 2012 +0100
Do submit empty dict, when something goes wrong
Addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn_check", line 332, in __run_action
(status, message, data) = CheckCli.__do_call(method, params, kwargs)
exceptions.ValueError: need more than 2 values to unpack
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index c363822..773a7b8 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -20,7 +20,7 @@ def xccdf_eval(args, cache_only=None):
oscap_err = _run_oscap(['xccdf', 'eval', '--results', results_file.name]
+ args['params'].split(' ') + [args['path']])
if not _assert_xml(results_file.name):
- return (1, 'oscap tool did not produce valid xml.')
+ return (1, 'oscap tool did not produce valid xml.', {})
ret, resume, xslt_err = _xccdf_resume(results_file.name)
os.unlink(results_file.name)
commit 34cc72c081ea9b0d151a5fb74ab2f22d0f14cd20
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Feb 28 15:39:47 2012 +0100
Fix syntax for python 2.4
Addressing:
File "scap.py", line 59
with open(filename, 'rb') as f:
^
SyntaxError: invalid syntax
Python 2.4 does not even support except and finally
clauses in a single statement.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 55ba2a1..c363822 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -56,12 +56,15 @@ def _popen(args):
stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
def _assert_xml(filename):
- with open(filename, 'rb') as f:
+ f = open(filename, 'rb')
+ try:
try:
xml.sax.parse(f, xml.sax.ContentHandler())
return True
except:
return False
+ finally:
+ f.close()
if __name__ == "__main__":
print xccdf_eval({
commit 713168a8804fc01afd82cdaa45812ee3274fac17
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Feb 28 14:47:49 2012 +0100
Remove unstructured debugging outputs.
diff --git a/backend/server/action_extra_data/scap.py b/backend/server/action_extra_data/scap.py
index 956a946..950af08 100644
--- a/backend/server/action_extra_data/scap.py
+++ b/backend/server/action_extra_data/scap.py
@@ -75,9 +75,6 @@ def _process_ruleresults(testresult_id, tr):
inserts['system'].append(ident.getAttribute('system'))
inserts['ident'].append(_get_text(ident))
inserts['type'].append(rule_result.nodeName)
- log_error(inserts)
- for i in ['tr_id', 'system', 'ident', 'type']:
- log_error(i, len(inserts[i]))
_store_ruleresults(inserts)
def _store_ruleresults(data):
12 years, 2 months
3 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/insert_package_name.sql | 25 +++
schema/spacewalk/oracle/procs/lookup_package_name.sql | 70 +++-------
schema/spacewalk/postgres/procs/insert_package_name.sql | 2
schema/spacewalk/postgres/procs/lookup_package_name.sql | 62 ++++----
schema/spacewalk/postgres/procs/procs.deps | 2
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.oracle | 42 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.postgresql | 49 +++++++
7 files changed, 178 insertions(+), 74 deletions(-)
New commits:
commit 044e869688aac307c5a007f50d1e6889553039df
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 16:25:26 2012 +0100
lookup_package_name: schema upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.oracle
new file mode 100644
index 0000000..b1e987f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.oracle
@@ -0,0 +1,42 @@
+create or replace function insert_package_name(name_in in varchar2)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageName(id, name)
+ values (rhn_pkg_name_seq.nextval, name_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
+
+create or replace function
+lookup_package_name(name_in in varchar2, ignore_null in number := 0)
+return number
+is
+ name_id number;
+begin
+ if ignore_null = 1 and name_in is null then
+ return null;
+ end if;
+
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
+
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_name(name_in);
+ exception when dup_val_on_index then
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
+ end;
+ return name_id;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.postgresql
new file mode 100644
index 0000000..a4339fb
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/099-lookup_package_name.sql.postgresql
@@ -0,0 +1,49 @@
+-- oracle equivalent source sha1 374bf89041a9c2a12ea0378495b55de0affb38db
+--
+-- Copyright (c) 2008--2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function
+lookup_package_name(name_in in varchar, ignore_null in numeric default 0)
+returns numeric
+as
+$$
+declare
+ name_id numeric;
+begin
+ if ignore_null = 1 and name_in is null then
+ return null;
+ end if;
+
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
+
+ if not found then
+ name_id := nextval('rhn_pkg_name_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageName(id, name) values (' || name_id || ', ' ||
+ coalesce(quote_literal(name_in), 'NULL') || ')');
+ exception when unique_violation then
+ select id
+ into strict name_id
+ from rhnPackageName
+ where name = name_in;
+ end;
+ end if;
+
+ return name_id;
+end;
+$$ language plpgsql immutable;
commit d8ba0df1296f399d0bdf50f3ec031219c0cf189d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 16:22:12 2012 +0100
use pg_dblink_exec to exec insert inside lookup_package_name
diff --git a/schema/spacewalk/postgres/procs/lookup_package_name.sql b/schema/spacewalk/postgres/procs/lookup_package_name.sql
index 743c6c7..f0b5b43 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_name.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_name.sql
@@ -1,7 +1,6 @@
--- oracle equivalent source sha1 791c0067198055114ca9fdf61f4a6a6d66f95b7d
--- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_package_name.sql
+-- oracle equivalent source sha1 3d574cd26eebe3152eb20bcb57fbbc4d264dfc12
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- Copyright (c) 2008--2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,35 +12,38 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_NAME(name_in IN VARCHAR, ignore_null in NUMERIC DEFAULT 0)
-RETURNS NUMERIC
-AS
+create or replace function
+lookup_package_name(name_in in varchar, ignore_null in numeric default 0)
+returns numeric
+as
$$
-DECLARE
- name_id NUMERIC;
-BEGIN
- if ignore_null = 1 and name_in is null then
- return null;
- end if;
+declare
+ name_id numeric;
+begin
+ if ignore_null = 1 and name_in is null then
+ return null;
+ end if;
- SELECT id
- INTO name_id
- FROM rhnPackageName
- WHERE name = name_in;
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
- IF NOT FOUND THEN
- INSERT INTO rhnPackageName (id, name) VALUES (nextval('rhn_pkg_name_seq'), name_in);
- name_id := currval('rhn_pkg_name_seq');
-
- END IF;
+ if not found then
+ name_id := nextval('rhn_pkg_name_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageName(id, name) values (' || name_id || ', ' ||
+ coalesce(quote_literal(name_in), 'NULL') || ')');
+ exception when unique_violation then
+ select id
+ into strict name_id
+ from rhnPackageName
+ where name = name_in;
+ end;
+ end if;
- RETURN name_id;
-END;
-$$ LANGUAGE PLPGSQL;
+ return name_id;
+end;
+$$ language plpgsql immutable;
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 9fd7058..29b13d2 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -88,7 +88,7 @@ lookup_package_arch :: rhn_exception.pks data/rhnException rhnPackag
data/rhnPackageArch
lookup_package_capability :: rhnPackageCapability
lookup_package_delta :: rhnPackageDelta
-lookup_package_name :: rhnPackageName
+lookup_package_name :: rhnPackageName pg_dblink_exec
lookup_package_provider :: rhnPackageProvider
lookup_package_key_type :: rhnPackageKeyType
lookup_package_nevra :: rhnPackageNEVRA
commit 8d0b4ffac0036df9075afabb3272c794c511cced
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 16:20:18 2012 +0100
use autonomous_transaction for insert only
diff --git a/schema/spacewalk/oracle/procs/insert_package_name.sql b/schema/spacewalk/oracle/procs/insert_package_name.sql
new file mode 100644
index 0000000..7c241d3
--- /dev/null
+++ b/schema/spacewalk/oracle/procs/insert_package_name.sql
@@ -0,0 +1,25 @@
+-- Copyright (c) 2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function insert_package_name(name_in in varchar2)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageName(id, name)
+ values (rhn_pkg_name_seq.nextval, name_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
diff --git a/schema/spacewalk/oracle/procs/lookup_package_name.sql b/schema/spacewalk/oracle/procs/lookup_package_name.sql
index ab27e9c..d5328cc 100644
--- a/schema/spacewalk/oracle/procs/lookup_package_name.sql
+++ b/schema/spacewalk/oracle/procs/lookup_package_name.sql
@@ -1,5 +1,4 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008-2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,48 +10,33 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_NAME(name_in IN VARCHAR2, ignore_null in number := 0)
-RETURN NUMBER
-IS
- PRAGMA AUTONOMOUS_TRANSACTION;
- name_id NUMBER;
-BEGIN
- if ignore_null = 1 and name_in is null then
- return null;
- end if;
+create or replace function
+lookup_package_name(name_in in varchar2, ignore_null in number := 0)
+return number
+is
+ name_id number;
+begin
+ if ignore_null = 1 and name_in is null then
+ return null;
+ end if;
- SELECT id
- INTO name_id
- FROM rhnPackageName
- WHERE name = name_in;
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
- RETURN name_id;
-EXCEPTION
- WHEN NO_DATA_FOUND THEN
- INSERT INTO rhnPackageName (id, name)
- VALUES (rhn_pkg_name_seq.nextval, name_in)
- RETURNING id INTO name_id;
- COMMIT;
- RETURN name_id;
-END;
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_name(name_in);
+ exception when dup_val_on_index then
+ select id
+ into name_id
+ from rhnPackageName
+ where name = name_in;
+ end;
+ return name_id;
+end;
/
-SHOW ERRORS
-
---
--- Revision 1.5 2003/02/28 19:58:35 pjones
--- api change for lookup_package_name
---
--- Revision 1.4 2003/02/28 19:27:32 pjones
--- make lookup_package_name return early null with null input
--- lookup_hw* in lookup_functions target
---
--- Revision 1.3 2002/05/13 22:53:38 pjones
--- cvs id/log
--- some (note enough) readability fixes
---
+show errors
diff --git a/schema/spacewalk/postgres/procs/insert_package_name.sql b/schema/spacewalk/postgres/procs/insert_package_name.sql
new file mode 100644
index 0000000..5650074
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_package_name.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 865d405e7f5618baa2e444e282fd8800296066f8
+-- This file is intentionally left empty.
12 years, 2 months
5 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/insert_package_delta.sql | 25 ++++
schema/spacewalk/oracle/procs/lookup_package_delta.sql | 58 ++++------
schema/spacewalk/postgres/procs/insert_package_capability.sql | 2
schema/spacewalk/postgres/procs/insert_package_delta.sql | 2
schema/spacewalk/postgres/procs/lookup_package_capability.sql | 2
schema/spacewalk/postgres/procs/lookup_package_delta.sql | 52 ++++----
schema/spacewalk/postgres/procs/procs.deps | 1
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.oracle | 38 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql | 44 +++++++
10 files changed, 166 insertions(+), 60 deletions(-)
New commits:
commit e0146a1e6dda3fb3789b68fc8855ac1b6be19e6a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 15:47:12 2012 +0100
fix sha1 sums
diff --git a/schema/spacewalk/postgres/procs/insert_package_delta.sql b/schema/spacewalk/postgres/procs/insert_package_delta.sql
index d232d35..813facd 100644
--- a/schema/spacewalk/postgres/procs/insert_package_delta.sql
+++ b/schema/spacewalk/postgres/procs/insert_package_delta.sql
@@ -1,2 +1,2 @@
--- oracle equivalent source sha1 83c8b7d30f415eea9580388f778e68541067d242
+-- oracle equivalent source sha1 4a8214db905b81b0ea4418155a53cc2e8bff4335
-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/lookup_package_delta.sql b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
index f1522ca..af20225 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_delta.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 942483729cc7d9263a99c6605ee35e14afd1e526
+-- oracle equivalent source sha1 eb7d5bd540d93ef3e48dd3e05f93b040a00b809d
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql
index 3a8d29e..9f75491 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 6b2fa37131c51df51f8a0f341f954168e05cff3e
+-- oracle equivalent source sha1 369db26375f04e6e734a7b746a3ce8b1ba78b0d9
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
commit ddbf46bf6631642879ae848f8329a98bfb88b3a9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 15:43:38 2012 +0100
lookup_package_delta: schema upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.oracle
new file mode 100644
index 0000000..f0ca072
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.oracle
@@ -0,0 +1,38 @@
+create or replace function insert_package_delta(n_in in varchar2)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageDelta(id, label)
+ values (rhn_packagedelta_id_seq.nextval, n_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
+
+create or replace function
+lookup_package_delta(n_in in varchar2)
+return number
+is
+ name_id number;
+begin
+ select id
+ into name_id
+ from rhnpackagedelta
+ where label = n_in;
+
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_delta(n_in);
+ exception when dup_val_on_index then
+ select id
+ into name_id
+ from rhnPackageDelta
+ where label = n_in;
+ end;
+ return name_id;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql
new file mode 100644
index 0000000..3a8d29e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/098-lookup_package_delta.sql.postgresql
@@ -0,0 +1,44 @@
+-- oracle equivalent source sha1 6b2fa37131c51df51f8a0f341f954168e05cff3e
+--
+-- Copyright (c) 2008--2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function lookup_package_delta(n_in in varchar)
+returns numeric
+as
+$$
+declare
+ name_id numeric;
+begin
+ select id
+ into name_id
+ from rhnPackageDelta
+ where label = n_in;
+
+ if not found then
+ name_id := nextval('rhn_packagedelta_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageDelta(id, label) values (' ||
+ name_id || ', ' || coalesce(quote_literal(n_in), 'NULL'), ')' );
+ exception when unique_violation then
+ select id
+ into strict name_id
+ from rhnpackagedelta
+ where label = n_in;
+ end;
+ end if;
+
+ return name_id;
+end;
+$$ language plpgsql immutable;
commit 7a9a5397dc37220aa0b9ef2464623a9b21ca3299
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 15:40:23 2012 +0100
use pg_dblink_exec to execute insert inside lookup_package_delta
diff --git a/schema/spacewalk/postgres/procs/lookup_package_delta.sql b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
index c39a9b8..f1522ca 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_delta.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
@@ -1,7 +1,6 @@
-- oracle equivalent source sha1 942483729cc7d9263a99c6605ee35e14afd1e526
--- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_package_delta.sql
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- Copyright (c) 2008--2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,28 +12,33 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_DELTA(n_in IN VARCHAR)
-RETURNS NUMERIC
-AS
+create or replace function lookup_package_delta(n_in in varchar)
+returns numeric
+as
$$
-DECLARE
- name_id NUMERIC;
-BEGIN
- SELECT id INTO name_id
- FROM rhnPackageDelta
- WHERE label = n_in;
+declare
+ name_id numeric;
+begin
+ select id
+ into name_id
+ from rhnPackageDelta
+ where label = n_in;
- IF NOT FOUND THEN
- INSERT INTO rhnPackageDelta (id, label) VALUES (nextval('rhn_packagedelta_id_seq'), n_in);
- name_id := currval('rhn_packagedelta_id_seq');
- END IF;
+ if not found then
+ name_id := nextval('rhn_packagedelta_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageDelta(id, label) values (' ||
+ name_id || ', ' || coalesce(quote_literal(n_in), 'NULL'), ')' );
+ exception when unique_violation then
+ select id
+ into strict name_id
+ from rhnpackagedelta
+ where label = n_in;
+ end;
+ end if;
- RETURN name_id;
-END;
-$$ LANGUAGE PLPGSQL;
+ return name_id;
+end;
+$$ language plpgsql immutable;
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 6b34819..9fd7058 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -87,6 +87,7 @@ lookup_checksum :: pg_dblink_exec
lookup_package_arch :: rhn_exception.pks data/rhnException rhnPackageArch \
data/rhnPackageArch
lookup_package_capability :: rhnPackageCapability
+lookup_package_delta :: rhnPackageDelta
lookup_package_name :: rhnPackageName
lookup_package_provider :: rhnPackageProvider
lookup_package_key_type :: rhnPackageKeyType
commit d53fd1a939d88e139650ae2032159fc98a129fb5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 14:04:12 2012 +0100
fix sha1 sums
diff --git a/schema/spacewalk/postgres/procs/insert_package_capability.sql b/schema/spacewalk/postgres/procs/insert_package_capability.sql
index bc27975..8ceb27a 100644
--- a/schema/spacewalk/postgres/procs/insert_package_capability.sql
+++ b/schema/spacewalk/postgres/procs/insert_package_capability.sql
@@ -1,2 +1,2 @@
--- oracle equivalent source sha1 eb465dbc3bda10414a4f848336018a9d1b91bf20
+-- oracle equivalent source sha1 a397d522dd41720dcd8b77e0a20d999ea5365355
-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/lookup_package_capability.sql b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
index b2d8625..a51795e 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_capability.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 a234e21a0def0d24de24d91a12fcbc9bca9ac22a
+-- oracle equivalent source sha1 52eb093fba09adfd4b8a9822023d89374276ef12
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql
index 27843d2..386f860 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 f90ddcef03fa88ab008080a48bab3670809f857d
+-- oracle equivalent source sha1 defa71d34e7a255e0a7e8db401dcfb72564bfdac
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
commit 90721be6aefb1378b862e7227a54a96bc710d16e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 14:02:29 2012 +0100
use autonomous_transaction for insert_only
diff --git a/schema/spacewalk/oracle/procs/insert_package_delta.sql b/schema/spacewalk/oracle/procs/insert_package_delta.sql
new file mode 100644
index 0000000..fd979b3
--- /dev/null
+++ b/schema/spacewalk/oracle/procs/insert_package_delta.sql
@@ -0,0 +1,25 @@
+-- Copyright (c) 2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function insert_package_delta(n_in in varchar2)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageDelta(id, label)
+ values (rhn_packagedelta_id_seq.nextval, n_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
diff --git a/schema/spacewalk/oracle/procs/lookup_package_delta.sql b/schema/spacewalk/oracle/procs/lookup_package_delta.sql
index 24fc705..eba9166 100644
--- a/schema/spacewalk/oracle/procs/lookup_package_delta.sql
+++ b/schema/spacewalk/oracle/procs/lookup_package_delta.sql
@@ -1,5 +1,4 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008-2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,36 +10,29 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_DELTA(n_in IN VARCHAR2)
-RETURN NUMBER
-IS
- PRAGMA AUTONOMOUS_TRANSACTION;
- name_id NUMBER;
-BEGIN
- SELECT id INTO name_id
- FROM rhnPackageDelta
- WHERE label = n_in;
-
- RETURN name_id;
-EXCEPTION
- WHEN NO_DATA_FOUND THEN
- INSERT INTO rhnPackageDelta (id, label)
- VALUES (rhn_packagedelta_id_seq.nextval, n_in)
- RETURNING id INTO name_id;
- COMMIT;
- RETURN name_id;
-END;
-/
-SHOW ERRORS
+create or replace function
+lookup_package_delta(n_in in varchar2)
+return number
+is
+ name_id number;
+begin
+ select id
+ into name_id
+ from rhnpackagedelta
+ where label = n_in;
---
--- Revision 1.1 2003/06/30 22:14:16 misa
--- bugzilla: none Added a lookup function for package delta
---
---
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_delta(n_in);
+ exception when dup_val_on_index then
+ select id
+ into name_id
+ from rhnPackageDelta
+ where label = n_in;
+ end;
+ return name_id;
+end;
+/
+show errors
diff --git a/schema/spacewalk/postgres/procs/insert_package_delta.sql b/schema/spacewalk/postgres/procs/insert_package_delta.sql
new file mode 100644
index 0000000..d232d35
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_package_delta.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 83c8b7d30f415eea9580388f778e68541067d242
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/lookup_package_delta.sql b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
index 7aa1b2f..c39a9b8 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_delta.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_delta.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 71a7553a3c473b6262ea6845d638ed420d4983e4
+-- oracle equivalent source sha1 942483729cc7d9263a99c6605ee35e14afd1e526
-- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_package_delta.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
12 years, 2 months
rel-eng/comps
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-client-fedora15.xml | 1 +
rel-eng/comps/comps-spacewalk-client-fedora16.xml | 1 +
rel-eng/comps/comps-spacewalk-client-rhel5.xml | 1 +
rel-eng/comps/comps-spacewalk-client-rhel6.xml | 1 +
4 files changed, 4 insertions(+)
New commits:
commit 0e517dbf984321317f72544401fa8b1584340f02
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 14:38:29 2012 +0100
Adding spacewalk-oscap to Spacewalk client repos.
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora15.xml b/rel-eng/comps/comps-spacewalk-client-fedora15.xml
index d8b5c4c..b8d2c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-fedora15.xml
+++ b/rel-eng/comps/comps-spacewalk-client-fedora15.xml
@@ -31,6 +31,7 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-oscap</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora16.xml b/rel-eng/comps/comps-spacewalk-client-fedora16.xml
index d8b5c4c..b8d2c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-client-fedora16.xml
@@ -31,6 +31,7 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-oscap</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel5.xml b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
index d8b5c4c..b8d2c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
@@ -31,6 +31,7 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-oscap</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel6.xml b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
index d8b5c4c..b8d2c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
@@ -31,6 +31,7 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-oscap</packagereq>
</packagelist>
</group>
</comps>
12 years, 2 months
rel-eng/comps
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-client-fedora14.xml | 36 ----
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 164 ----------------------
2 files changed, 200 deletions(-)
New commits:
commit e738fd99965cef5345c86697b47eabef40607d3c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 14:33:48 2012 +0100
We are no longer building Spacewalk for Fedora 14.
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora14.xml b/rel-eng/comps/comps-spacewalk-client-fedora14.xml
deleted file mode 100644
index d8b5c4c..0000000
--- a/rel-eng/comps/comps-spacewalk-client-fedora14.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-
-<comps>
-<!-- <meta> -->
-<!-- Meta information will go here eventually -->
-<!-- </meta> -->
- <group>
- <id>spacewalk-client</id>
- <name>Spacewalk Client</name>
- <description>Spacewalk Client Packages</description>
- <uservisible>true</uservisible>
- <packagelist>
- <packagereq type="default">rhncfg</packagereq>
- <packagereq type="default">rhncfg-actions</packagereq>
- <packagereq type="default">rhncfg-client</packagereq>
- <packagereq type="default">rhncfg-management</packagereq>
- <packagereq type="default">rhn-custom-info</packagereq>
- <packagereq type="default">osad</packagereq>
- <packagereq type="default">rhn-client-tools</packagereq>
- <packagereq type="default">rhn-virtualization-common</packagereq>
- <packagereq type="default">rhn-virtualization-host</packagereq>
- <packagereq type="default">spacewalk-koan</packagereq>
- <packagereq type="default">rhnlib</packagereq>
- <packagereq type="default">rhnmd</packagereq>
- <packagereq type="default">rhnsd</packagereq>
- <packagereq type="default">rhn-check</packagereq>
- <packagereq type="default">rhn-setup</packagereq>
- <packagereq type="default">rhn-setup-gnome</packagereq>
- <packagereq type="default">yum-rhn-plugin</packagereq>
- <packagereq type="default">spacewalk-certs-tools</packagereq>
- <packagereq type="default">spacewalk-client-repo</packagereq>
- <packagereq type="default">spacewalk-backend-libs</packagereq>
- </packagelist>
- </group>
-</comps>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
deleted file mode 100644
index 7349e14..0000000
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-
-<comps>
-<!-- <meta> -->
-<!-- Meta information will go here eventually -->
-<!-- </meta> -->
- <group>
- <id>spacewalk-server</id>
- <name>Spacewalk Server</name>
- <description>Spacewalk Server Packages</description>
- <uservisible>true</uservisible>
- <packagelist>
-<!-- client libs - needed till it get propagated to distribuitions -->
- <packagereq type="default">rhnlib</packagereq>
- <packagereq type="default">rhn-check</packagereq>
- <packagereq type="default">rhn-setup</packagereq>
- <packagereq type="default">rhn-setup-gnome</packagereq>
- <packagereq type="default">rhn-client-tools</packagereq>
- <packagereq type="default">yum-rhn-plugin</packagereq>
-
- <packagereq type="default">cx_Oracle</packagereq>
- <packagereq type="default">eventReceivers</packagereq>
- <packagereq type="default">heirloom-pkgtools</packagereq>
- <packagereq type="default">jpam</packagereq>
- <packagereq type="default">MessageQueue</packagereq>
- <packagereq type="default">nocpulse-common</packagereq>
- <packagereq type="default">nocpulse-db-perl</packagereq>
- <packagereq type="default">NOCpulsePlugins</packagereq>
- <packagereq type="default">NOCpulsePlugins-Oracle</packagereq>
- <packagereq type="default">NPalert</packagereq>
- <packagereq type="default">nutch</packagereq>
- <packagereq type="default">oracle-instantclient-selinux</packagereq>
- <packagereq type="default">oracle-instantclient-sqlplus-selinux</packagereq>
- <packagereq type="default">oracle-lib-compat</packagereq>
- <packagereq type="default">oracle-nofcontext-selinux</packagereq>
- <packagereq type="default">oracle-selinux</packagereq>
- <packagereq type="default">oracle-xe-selinux</packagereq>
- <packagereq type="default">osa-dispatcher</packagereq>
- <packagereq type="default">osa-dispatcher-selinux</packagereq>
- <packagereq type="default">perl-DBD-Oracle</packagereq>
- <packagereq type="default">perl-NOCpulse-CLAC</packagereq>
- <packagereq type="default">perl-NOCpulse-Debug</packagereq>
- <packagereq type="default">perl-NOCpulse-Gritch</packagereq>
- <packagereq type="default">perl-NOCpulse-Object</packagereq>
- <packagereq type="default">perl-NOCpulse-OracleDB</packagereq>
- <packagereq type="default">perl-NOCpulse-PersistentConnection</packagereq>
- <packagereq type="default">perl-NOCpulse-Probe</packagereq>
- <packagereq type="default">perl-NOCpulse-Probe-Oracle</packagereq>
- <packagereq type="default">perl-NOCpulse-ProcessPool</packagereq>
- <packagereq type="default">perl-NOCpulse-Scheduler</packagereq>
- <packagereq type="default">perl-NOCpulse-SetID</packagereq>
- <packagereq type="default">perl-NOCpulse-Utils</packagereq>
- <packagereq type="default">perl-Satcon</packagereq>
- <packagereq type="default">ProgAGoGo</packagereq>
- <packagereq type="default">python-gzipstream</packagereq>
- <packagereq type="default">quartz</packagereq>
- <packagereq type="default">quartz-oracle</packagereq>
- <packagereq type="default">redstone-xmlrpc</packagereq>
- <packagereq type="default">rhnpush</packagereq>
- <packagereq type="default">SatConfig-bootstrap</packagereq>
- <packagereq type="default">SatConfig-bootstrap-server</packagereq>
- <packagereq type="default">SatConfig-cluster</packagereq>
- <packagereq type="default">SatConfig-general</packagereq>
- <packagereq type="default">SatConfig-generator</packagereq>
- <packagereq type="default">SatConfig-installer</packagereq>
- <packagereq type="default">SatConfig-spread</packagereq>
- <packagereq type="default">scdb</packagereq>
- <packagereq type="default">simple-core</packagereq>
- <packagereq type="default">SNMPAlerts</packagereq>
- <packagereq type="default">spacecmd</packagereq>
- <packagereq type="default">spacewalk-admin</packagereq>
- <packagereq type="default">spacewalk-backend</packagereq>
- <packagereq type="default">spacewalk-backend-app</packagereq>
- <packagereq type="default">spacewalk-backend-applet</packagereq>
- <packagereq type="default">spacewalk-backend-config-files</packagereq>
- <packagereq type="default">spacewalk-backend-config-files-common</packagereq>
- <packagereq type="default">spacewalk-backend-config-files-tool</packagereq>
- <packagereq type="default">spacewalk-backend-iss</packagereq>
- <packagereq type="default">spacewalk-backend-iss-export</packagereq>
- <packagereq type="default">spacewalk-backend-libs</packagereq>
- <packagereq type="default">spacewalk-backend-package-push-server</packagereq>
- <packagereq type="default">spacewalk-backend-server</packagereq>
- <packagereq type="default">spacewalk-backend-sql</packagereq>
- <packagereq type="default">spacewalk-backend-sql-oracle</packagereq>
- <packagereq type="default">spacewalk-backend-sql-postgresql</packagereq>
- <packagereq type="default">spacewalk-backend-tools</packagereq>
- <packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
- <packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
- <packagereq type="default">spacewalk-backend-xp</packagereq>
- <packagereq type="default">spacewalk-base</packagereq>
- <packagereq type="default">spacewalk-base-minimal</packagereq>
- <packagereq type="default">spacewalk-branding</packagereq>
- <packagereq type="default">spacewalk-certs-tools</packagereq>
- <packagereq type="default">spacewalk-client-repo</packagereq>
- <packagereq type="default">spacewalk-common</packagereq>
- <packagereq type="default">spacewalk-config</packagereq>
- <packagereq type="default">spacewalk-dobby</packagereq>
- <packagereq type="default">spacewalk-doc-indexes</packagereq>
- <packagereq type="default">spacewalk-grail</packagereq>
- <packagereq type="default">spacewalk-html</packagereq>
- <packagereq type="default">spacewalk-java</packagereq>
- <packagereq type="default">spacewalk-java-config</packagereq>
- <packagereq type="default">spacewalk-java-lib</packagereq>
- <packagereq type="default">spacewalk-java-oracle</packagereq>
- <packagereq type="default">spacewalk-java-postgresql</packagereq>
- <packagereq type="default">spacewalk-monitoring</packagereq>
- <packagereq type="default">spacewalk-monitoring-selinux</packagereq>
- <packagereq type="default">spacewalk-oracle</packagereq>
- <packagereq type="default">spacewalk-postgresql</packagereq>
- <packagereq type="default">spacewalk-proxy-broker</packagereq>
- <packagereq type="default">spacewalk-proxy-common</packagereq>
- <packagereq type="default">spacewalk-proxy-docs</packagereq>
- <packagereq type="default">spacewalk-proxy-html</packagereq>
- <packagereq type="default">spacewalk-proxy-installer</packagereq>
- <packagereq type="default">spacewalk-proxy-management</packagereq>
- <packagereq type="default">spacewalk-proxy-monitoring</packagereq>
- <packagereq type="default">spacewalk-proxy-package-manager</packagereq>
- <packagereq type="default">spacewalk-proxy-redirect</packagereq>
- <packagereq type="default">spacewalk-proxy-selinux</packagereq>
- <packagereq type="default">spacewalk-pxt</packagereq>
- <packagereq type="default">spacewalk-pylint</packagereq>
- <packagereq type="default">spacewalk-repo</packagereq>
- <packagereq type="default">spacewalk-reports</packagereq>
- <packagereq type="default">spacewalk-schema</packagereq>
- <packagereq type="default">spacewalk-search</packagereq>
- <packagereq type="default">spacewalk-selinux</packagereq>
- <packagereq type="default">spacewalk-setup</packagereq>
- <packagereq type="default">spacewalk-setup-jabberd</packagereq>
- <packagereq type="default">spacewalk-slf4j</packagereq>
- <packagereq type="default">spacewalk-sniglets</packagereq>
- <packagereq type="default">spacewalk-ssl-cert-check</packagereq>
- <packagereq type="default">spacewalk-taskomatic</packagereq>
- <packagereq type="default">spacewalk-utils</packagereq>
- <packagereq type="default">spacewalk-remote-utils</packagereq>
- <packagereq type="default">SputLite-client</packagereq>
- <packagereq type="default">SputLite-server</packagereq>
- <packagereq type="default">ssl_bridge</packagereq>
- <packagereq type="default">status_log_acceptor</packagereq>
- <packagereq type="default">stringtree-json</packagereq>
- <packagereq type="default">tanukiwrapper</packagereq>
- <packagereq type="default">tsdb</packagereq>
- </packagelist>
- </group>
- <group>
- <id>spacewalk-server-docs</id>
- <name>Spacewalk Server Documentation</name>
- <description>Spacewalk Server Documentation Packages</description>
- <uservisible>false</uservisible>
- <packagelist>
- <packagereq type="optional">jpam-javadoc</packagereq>
- </packagelist>
- </group>
- <group>
- <id>spacewalk-server-no-install</id>
- <name>Spacewalk Server Junk</name>
- <description>Spacewalk Server Non-installatble Packages</description>
- <uservisible>false</uservisible>
- <packagelist>
- <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
- <packagereq type="optional">spacewalk-java-tests</packagereq>
- </packagelist>
- </group>
-</comps>
12 years, 2 months
Changes to 'refs/tags/spacewalk-setup-1.7.8-1'
by Miroslav Suchý
Tag 'spacewalk-setup-1.7.8-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-02-28 13:29 +0000
Tagging package [spacewalk-setup] version [1.7.8-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.7.35-1:
Miroslav Suchý (2):
do not ignore missing answer-file
Automatic commit of package [spacewalk-setup] release [1.7.8-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 2 months
2 commits - rel-eng/packages spacewalk/setup
by Miroslav Suchý
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 32a187c50917cdb07cb6f76adcf74b9d6801a810
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Feb 28 14:29:48 2012 +0100
Automatic commit of package [spacewalk-setup] release [1.7.8-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d33bd10..8a22ca4 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.7.7-1 spacewalk/setup/
+1.7.8-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 545cb83..953699e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.7.7
+Version: 1.7.8
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/spacewalk-make-mount-points*
%changelog
+* Tue Feb 28 2012 Miroslav Suchý 1.7.8-1
+- do not ignore missing answer-file (msuchy(a)redhat.com)
+
* Tue Feb 28 2012 Jan Pazdziora 1.7.7-1
- Make sure /etc/cobbler/settings has 644.
commit 01ac3a25e8ec52f6dc676d395c854bd8a3b857ba
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Feb 28 14:28:21 2012 +0100
do not ignore missing answer-file
if it is missing we want to print error message and exit
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index b32e7dd..f2b2a7c 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -171,7 +171,7 @@ sub load_answer_file {
for my $file (@files) {
- next unless -r $file;
+ next unless (-r $file or $file eq $options->{'answer-file'});
if ($options->{'answer-file'} and $file eq $options->{'answer-file'}) {
print loc("* Loading answer file: %s.\n", $file);
12 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.7.35-1'
by Michael Mraka
Tag 'spacewalk-backend-1.7.35-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-02-28 13:18 +0000
Tagging package [spacewalk-backend] version [1.7.35-1] in directory [backend/].
Changes since spacewalk-schema-1.7.46-1:
Michael Mraka (2):
fixed 'speeded up searching whether package is already synced'
Automatic commit of package [spacewalk-backend] release [1.7.35-1].
Milan Zazrivec (3):
use autonomous_transaction for insert only
use pg_dblink_exec to exec insert inside lookup_package_capability
lookup_package_capability: schema upgrade
---
backend/server/rhnPackage.py | 2
backend/spacewalk-backend.spec | 5
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/oracle/procs/insert_package_capability.sql | 25 ++
schema/spacewalk/oracle/procs/lookup_package_capability.sql | 85 +++++----
schema/spacewalk/postgres/procs/insert_package_capability.sql | 2
schema/spacewalk/postgres/procs/lookup_package_capability.sql | 86 +++++-----
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.oracle | 56 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql | 65 +++++++
9 files changed, 246 insertions(+), 82 deletions(-)
---
12 years, 2 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/server/rhnPackage.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit df7a200a07b42a3e60d8a6ffe6b0d2cdb3071fed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 28 14:18:21 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.7.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fa98bc9..22eb7de 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.7.34
+Version: 1.7.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Feb 28 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.35-1
+- fixed 'speeded up searching whether package is already synced'
+
* Tue Feb 28 2012 Jan Pazdziora 1.7.34-1
- Avoid vn_rhnpackageevr_epoch violation.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d04c345..1e7c541 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.7.34-1 backend/
+1.7.35-1 backend/
commit 6197300f6fb8fa94aa089ba9f1837868710c3285
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 28 14:16:08 2012 +0100
fixed 'speeded up searching whether package is already synced'
fixing
Traceback (most recent call last):
File "/usr/bin/spacewalk-repo-sync", line 100, in <module>
...
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnPackage.py", line 336, in get_info_for_package
h.execute(**params)
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 163, in execute
return apply(self._execute_wrapper, (self._execute, ) + p, kw)
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 108, in _execute_wrapper
retval = apply(function, p, kw)
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 217, in _execute
return self._execute_(args, kwargs)
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_cx_Oracle.py", line 161, in _execute_
self._real_cursor.execute(*(None, ), **params)
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('ORA-00904: "C"."LABEL": invalid identifier\n', 904, 'select p.path, cp.channel_id, cv.checksum_type, cv.checksum from rhnPackage p join rhnPackageName pn on p.name_id = pn.id join rhnPackageEVR pe on p.evr_id = pe.id join rhnPackageArch pa on p.package_arch_id = pa.id left join rhnChannelPackage cp on p.id = cp.package_id and cp.channel_id = :channel_id join rhnChecksumView cv on p.checksum_id = cv.id where pn.name = :name and pe.version = :ver and pe.release = :rel and (epoch is null or epoch = :epoch) and pa.label = :arch order by c.label nulls last')
introduced in commit b01266b6f68df0863b78878171448aa833435b87
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index 3b3b511..89b7d39 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -330,7 +330,7 @@ def get_info_for_package(pkg, channel_id):
and pe.release = :rel
and %s
and pa.label = :arch
- order by c.label nulls last
+ order by cp.channel_id nulls last
""" % epochStatement
h = rhnSQL.prepare(statement)
h.execute(**params)
12 years, 2 months
3 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/insert_package_capability.sql | 25 ++
schema/spacewalk/oracle/procs/lookup_package_capability.sql | 85 +++++----
schema/spacewalk/postgres/procs/insert_package_capability.sql | 2
schema/spacewalk/postgres/procs/lookup_package_capability.sql | 86 +++++-----
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.oracle | 56 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql | 65 +++++++
6 files changed, 240 insertions(+), 79 deletions(-)
New commits:
commit 2f1e29f8a91f09e879cb99b6267a1e4e7cb813ad
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 13:51:08 2012 +0100
lookup_package_capability: schema upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.oracle
new file mode 100644
index 0000000..1fc155f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.oracle
@@ -0,0 +1,56 @@
+create or replace function insert_package_capability(name_in in varchar2, version_in in varchar2 default null)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageCapability (id, name, version)
+ values (rhn_pkg_capability_id_seq.nextval, name_in, version_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
+
+create or replace function
+lookup_package_capability(name_in in varchar2, version_in in varchar2 default null)
+return number
+is
+ name_id number;
+begin
+ if version_in is null then
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version = version_in;
+ end if;
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_capability(name_in, version_in);
+ exception when dup_val_on_index then
+ if version_in is null then
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version = version_in;
+ end if;
+
+ end;
+ return name_id;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql
new file mode 100644
index 0000000..27843d2
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/097-lookup_package_capability.sql.postgresql
@@ -0,0 +1,65 @@
+-- oracle equivalent source sha1 f90ddcef03fa88ab008080a48bab3670809f857d
+--
+-- Copyright (c) 2008--2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function lookup_package_capability(name_in in varchar, version_in in varchar default null)
+returns numeric
+as
+$$
+declare
+ name_id numeric;
+begin
+ if version_in is null then
+ select id
+ into name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version = version_in;
+ end if;
+
+ if not found then
+ name_id = nextval('rhn_pkg_capability_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageCapability(id, name, version) values (' ||
+ name_id || ', ' ||
+ coalesce(quote_literal(name_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(version_in), 'NULL') || ')');
+ exception when unique_violation then
+ if version_in is null then
+ select id
+ into strict name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into strict name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version = version_in;
+ end if;
+ end;
+ end if;
+
+ return name_id;
+end;
+$$
+language plpgsql immutable;
commit 75c284932a47e63c186c517bba890b91934f7a82
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 13:49:09 2012 +0100
use pg_dblink_exec to exec insert inside lookup_package_capability
diff --git a/schema/spacewalk/postgres/procs/lookup_package_capability.sql b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
index 1b85692..b2d8625 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_capability.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
@@ -1,7 +1,6 @@
-- oracle equivalent source sha1 a234e21a0def0d24de24d91a12fcbc9bca9ac22a
--- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_package_capability.sql
--
--- Copyright (c) 2008--2010 Red Hat, Inc.
+-- Copyright (c) 2008--2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,41 +12,54 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_CAPABILITY(name_in IN VARCHAR,
- version_in IN VARCHAR DEFAULT NULL)
-RETURNS NUMERIC
-AS
+create or replace function lookup_package_capability(name_in in varchar, version_in in varchar default null)
+returns numeric
+as
$$
-DECLARE
- name_id NUMERIC;
-BEGIN
- IF version_in IS NULL THEN
- SELECT id
- INTO name_id
- FROM rhnPackageCapability
- WHERE name = name_in
- AND version IS NULL;
- ELSE
- SELECT id
- INTO name_id
- FROM rhnPackageCapability
- WHERE name = name_in
- AND version = version_in;
- END IF;
+declare
+ name_id numeric;
+begin
+ if version_in is null then
+ select id
+ into name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version = version_in;
+ end if;
+
+ if not found then
+ name_id = nextval('rhn_pkg_capability_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageCapability(id, name, version) values (' ||
+ name_id || ', ' ||
+ coalesce(quote_literal(name_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(version_in), 'NULL') || ')');
+ exception when unique_violation then
+ if version_in is null then
+ select id
+ into strict name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into strict name_id
+ from rhnpackagecapability
+ where name = name_in and
+ version = version_in;
+ end if;
+ end;
+ end if;
- IF NOT FOUND THEN
- INSERT INTO rhnPackageCapability (id, name, version) VALUES (nextval('rhn_pkg_capability_id_seq'), name_in, version_in);
- name_id := currval('rhn_pkg_capability_id_seq');
- END IF;
-
- RETURN name_id;
-END;
+ return name_id;
+end;
$$
-LANGUAGE PLPGSQL;
+language plpgsql immutable;
commit 17df58b2aaef0e92609974fd439a0c12bd014f09
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 13:40:18 2012 +0100
use autonomous_transaction for insert only
diff --git a/schema/spacewalk/oracle/procs/insert_package_capability.sql b/schema/spacewalk/oracle/procs/insert_package_capability.sql
new file mode 100644
index 0000000..6dbc67a
--- /dev/null
+++ b/schema/spacewalk/oracle/procs/insert_package_capability.sql
@@ -0,0 +1,25 @@
+-- Copyright (c) 2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+
+create or replace function insert_package_capability(name_in in varchar2, version_in in varchar2 default null)
+return number
+is
+ pragma autonomous_transaction;
+ name_id number;
+begin
+ insert into rhnPackageCapability (id, name, version)
+ values (rhn_pkg_capability_id_seq.nextval, name_in, version_in) returning id into name_id;
+ commit;
+ return name_id;
+end;
+/
diff --git a/schema/spacewalk/oracle/procs/lookup_package_capability.sql b/schema/spacewalk/oracle/procs/lookup_package_capability.sql
index a821834..9a66fa2 100644
--- a/schema/spacewalk/oracle/procs/lookup_package_capability.sql
+++ b/schema/spacewalk/oracle/procs/lookup_package_capability.sql
@@ -1,5 +1,4 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008-2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -11,45 +10,47 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-CREATE OR REPLACE FUNCTION
-LOOKUP_PACKAGE_CAPABILITY(name_in IN VARCHAR2,
- version_in IN VARCHAR2 DEFAULT NULL)
-RETURN NUMBER
-IS
- PRAGMA AUTONOMOUS_TRANSACTION;
- name_id NUMBER;
-BEGIN
- IF version_in IS NULL THEN
- SELECT id
- INTO name_id
- FROM rhnPackageCapability
- WHERE name = name_in
- AND version IS NULL;
- ELSE
- SELECT id
- INTO name_id
- FROM rhnPackageCapability
- WHERE name = name_in
- AND version = version_in;
- END IF;
- RETURN name_id;
-EXCEPTION
- WHEN NO_DATA_FOUND THEN
- INSERT INTO rhnPackageCapability (id, name, version)
- VALUES (rhn_pkg_capability_id_seq.nextval, name_in, version_in)
- RETURNING id INTO name_id;
- COMMIT;
- RETURN name_id;
-END;
-/
-SHOW ERRORS
+create or replace function
+lookup_package_capability(name_in in varchar2, version_in in varchar2 default null)
+return number
+is
+ name_id number;
+begin
+ if version_in is null then
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version = version_in;
+ end if;
+ return name_id;
+exception when no_data_found then
+ begin
+ name_id := insert_package_capability(name_in, version_in);
+ exception when dup_val_on_index then
+ if version_in is null then
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version is null;
+ else
+ select id
+ into name_id
+ from rhnPackageCapability
+ where name = name_in and
+ version = version_in;
+ end if;
---
--- Revision 1.1 2003/03/03 16:46:51 misa
--- bugzilla: 83674 Reworked the schema for package removal
---
+ end;
+ return name_id;
+end;
+/
+show errors
diff --git a/schema/spacewalk/postgres/procs/insert_package_capability.sql b/schema/spacewalk/postgres/procs/insert_package_capability.sql
new file mode 100644
index 0000000..bc27975
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_package_capability.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 eb465dbc3bda10414a4f848336018a9d1b91bf20
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/lookup_package_capability.sql b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
index 8d68a2c..1b85692 100644
--- a/schema/spacewalk/postgres/procs/lookup_package_capability.sql
+++ b/schema/spacewalk/postgres/procs/lookup_package_capability.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 2a9d6258e70469a6cb38bc5be57a865a3cc8e65b
+-- oracle equivalent source sha1 a234e21a0def0d24de24d91a12fcbc9bca9ac22a
-- retrieved from ./1241042199/53fa26df463811901487b608eecc3f77ca7783a1/schema/spacewalk/oracle/procs/lookup_package_capability.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
12 years, 2 months