6 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/insert_config_info.sql | 34 +++++
schema/spacewalk/oracle/procs/lookup_config_info.sql | 21 +--
schema/spacewalk/oracle/procs/procs.deps | 2
schema/spacewalk/postgres/procs/insert_config_info.sql | 2
schema/spacewalk/postgres/procs/lookup_config_info.sql | 24 ++-
schema/spacewalk/postgres/procs/procs.deps | 1
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle | 62 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql | 67 ++++++++++
8 files changed, 196 insertions(+), 17 deletions(-)
New commits:
commit 6fa2558f0bf0cbb758ac4d1eee7bf9f66ee15dbf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 11:00:53 2012 +0100
update postgresql procs dependencies
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 276d5f5..6abde3a 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -66,6 +66,7 @@ lookup_channel_arch :: rhn_exception.pks data/rhnException rhnChanne
lookup_client_capability :: rhnClientCapabilityName pg_dblink_exec
lookup_cf_state :: rhnConfigFileState
lookup_config_filename :: pg_dblink_exec
+lookup_config_info :: pg_dblink_exec
lookup_cve :: rhnCVE
lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType
lookup_evr :: rhnPackageEVR
commit a2ff80d0d934a6104baa5b43cef8bddf35788ee3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:59:26 2012 +0100
lookup_config_info: postgresql schema ugprade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql
new file mode 100644
index 0000000..1ba81f8
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.postgresql
@@ -0,0 +1,67 @@
+-- oracle equivalent source sha1 972edb1a123761b8e7d7e239455bff1bae2307b1
+--
+-- Copyright (c) 2008--2010 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_config_info
+(
+ username_in in varchar,
+ groupname_in in varchar,
+ filemode_in in numeric,
+ selinux_ctx_in in varchar,
+ symlink_target_id in numeric
+)
+returns numeric
+as
+$$
+declare
+ r numeric;
+ v_id numeric;
+ lookup_cursor cursor for
+ select id
+ from rhnConfigInfo
+ where 1=1
+ and (username = username_in or (username is null and username_in is null))
+ and (groupname = groupname_in or (groupname is null and groupname_in is null))
+ and (filemode = filemode_in or (filemode is null and filemode_in is null))
+ and (selinux_ctx = selinux_ctx_in or
+ (selinux_ctx is null and selinux_ctx_in is null))
+ and (symlink_target_filename_id = symlink_target_id or
+ (symlink_target_filename_id is null and symlink_target_id is null))
+ ;
+begin
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
+ -- If we got here, we don't have the id
+ v_id := nextval('rhn_confinfo_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnConfigInfo ' ||
+ '(id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)' ||
+ 'values (' || v_id || ', ' ||
+ coalesce(quote_literal(username_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(groupname_in), 'NULL') || ', ' ||
+ coalesce(quote_literal( filemode_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(selinux_ctx_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(symlink_target_id), 'NULL') || ')');
+ exception when unique_violation then
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
+ end;
+ return v_id;
+end;
+$$ language plpgsql immutable;
commit f908b168e04528f1fda66b06bbdbe6b77c216ae8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:58:33 2012 +0100
use pg_dblink_exec to execute insert inside lookup_config_info
diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql
index 4e5efb6..980be5a 100644
--- a/schema/spacewalk/postgres/procs/lookup_config_info.sql
+++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql
@@ -46,10 +46,22 @@ begin
return r.id;
end loop;
-- If we got here, we don't have the id
- select nextval('rhn_confinfo_id_seq') into v_id;
- insert into rhnConfigInfo
- (id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)
- values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in, symlink_target_id);
+ v_id := nextval('rhn_confinfo_id_seq');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnConfigInfo ' ||
+ '(id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)' ||
+ 'values (' || v_id || ', ' ||
+ coalesce(quote_literal(username_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(groupname_in), 'NULL') || ', ' ||
+ coalesce(quote_literal( filemode_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(selinux_ctx_in), 'NULL') || ', ' ||
+ coalesce(quote_literal(symlink_target_id), 'NULL') || ')');
+ exception when unique_violation then
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
+ end;
return v_id;
end;
-$$ language plpgsql;
+$$ language plpgsql immutable;
commit 91fb6cc2e1489415ad9f7106757bc4787a666a28
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:46:14 2012 +0100
lookup_config_info: correct proc dependencies
diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps
index de72a8f..8e4c3e1 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -61,6 +61,7 @@ does_user_have_role :: rhnUserGroup rhnUserGroupMembers rhnUserGroup
insert_client_capability :: rhnClientCapabilityName
insert_checksum :: rhnChecksum rhnChecksumType
insert_config_filename :: rhnConfigFileName
+insert_config_info :: rhnConfigInfo
is_user_applicant :: rhnUserGroupType web_contact rhnUserGroup \
rhnUserGroupMembers
lookup_arch_type :: data/rhnArchType rhn_exception.pks
@@ -70,6 +71,7 @@ lookup_checksum :: rhnChecksumView insert_checksum
lookup_client_capability :: insert_client_capability rhnClientCapabilityName
lookup_cf_state :: rhnConfigFileState
lookup_config_filename :: insert_config_filename
+lookup_config_info :: insert_config_info
lookup_cve :: rhnCVE
lookup_erratafile_type :: rhnErrataFileType data/rhnErrataFileType
lookup_evr :: rhnPackageEVR
commit 15604f10426a91f57305a9860f22af1ace870d48
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:43:54 2012 +0100
lookup_config_info: schema upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle
new file mode 100644
index 0000000..048d825
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/093-lookup_config_info.sql.oracle
@@ -0,0 +1,62 @@
+create or replace function insert_config_info (
+ username_in in varchar2,
+ groupname_in in varchar2,
+ filemode_in in number,
+ selinux_ctx_in in varchar2,
+ symlink_target_id in number
+) return number
+is
+ pragma autonomous_transaction;
+ v_id number;
+begin
+ select rhn_confinfo_id_seq.nextval
+ into v_id
+ from dual;
+ insert into rhnConfigInfo (id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)
+ values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in, symlink_target_id);
+ commit;
+ return v_id;
+end;
+/
+
+create or replace function
+lookup_config_info (
+ username_in in varchar2,
+ groupname_in in varchar2,
+ filemode_in in number,
+ selinux_ctx_in in varchar2,
+ symlink_target_id in number
+) return number
+deterministic
+is
+ pragma autonomous_transaction;
+ v_id number;
+ cursor lookup_cursor is
+ select id
+ from rhnConfigInfo
+ where 1=1
+ and nvl(username, ' ') = nvl(username_in, ' ')
+ and nvl(groupname,' ') = nvl(groupname_in, ' ')
+ and nvl(filemode, -1) = nvl(filemode_in, -1)
+ and nvl(selinux_ctx, ' ') = nvl(selinux_ctx_in, ' ')
+ and nvl(symlink_target_filename_id, -1) = nvl(symlink_target_id, -1)
+ ;
+begin
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
+ -- If we got here, we don't have the id
+ v_id := insert_config_info(
+ username_in,
+ groupname_in,
+ filemode_in,
+ selinux_ctx_in,
+ symlink_target_id);
+exception when dup_val_on_index then
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
+ return v_id;
+end lookup_config_info;
+/
+show errors
commit 517eb35618d4007cd577ce6a40a4d6dbefb928f8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:41:03 2012 +0100
restrict autonomous_transaction to insert only
diff --git a/schema/spacewalk/oracle/procs/insert_config_info.sql b/schema/spacewalk/oracle/procs/insert_config_info.sql
new file mode 100644
index 0000000..8ffe0e5
--- /dev/null
+++ b/schema/spacewalk/oracle/procs/insert_config_info.sql
@@ -0,0 +1,34 @@
+-- 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_config_info (
+ username_in in varchar2,
+ groupname_in in varchar2,
+ filemode_in in number,
+ selinux_ctx_in in varchar2,
+ symlink_target_id in number
+) return number
+is
+ pragma autonomous_transaction;
+ v_id number;
+begin
+ select rhn_confinfo_id_seq.nextval
+ into v_id
+ from dual;
+ insert into rhnConfigInfo (id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)
+ values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in, symlink_target_id);
+ commit;
+ return v_id;
+end;
+/
diff --git a/schema/spacewalk/oracle/procs/lookup_config_info.sql b/schema/spacewalk/oracle/procs/lookup_config_info.sql
index b2aa167..8769931 100644
--- a/schema/spacewalk/oracle/procs/lookup_config_info.sql
+++ b/schema/spacewalk/oracle/procs/lookup_config_info.sql
@@ -1,4 +1,3 @@
---
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
@@ -11,10 +10,6 @@
-- 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_config_info (
@@ -43,12 +38,16 @@ begin
return r.id;
end loop;
-- If we got here, we don't have the id
- select rhn_confinfo_id_seq.nextval
- into v_id
- from dual;
- insert into rhnConfigInfo (id, username, groupname, filemode, selinux_ctx, symlink_target_filename_id)
- values (v_id, username_in, groupname_in, filemode_in, selinux_ctx_in, symlink_target_id);
- commit;
+ v_id := insert_config_info(
+ username_in,
+ groupname_in,
+ filemode_in,
+ selinux_ctx_in,
+ symlink_target_id);
+exception when dup_val_on_index then
+ for r in lookup_cursor loop
+ return r.id;
+ end loop;
return v_id;
end lookup_config_info;
/
diff --git a/schema/spacewalk/postgres/procs/insert_config_info.sql b/schema/spacewalk/postgres/procs/insert_config_info.sql
new file mode 100644
index 0000000..a43dd9b
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_config_info.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 927ed17ae7b2c43d40e5a397f793ad986f7ba410
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql
index 5be0e94..4e5efb6 100644
--- a/schema/spacewalk/postgres/procs/lookup_config_info.sql
+++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 66ef8ae50f983aa465ebe116c6c5d0d44f4073ea
+-- oracle equivalent source sha1 d6f51503a2c3261083fa31ce1bb1343c718292c1
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
12 years, 2 months
Changes to 'refs/tags/spacewalk-setup-1.7.7-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.7.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-28 09:54 +0000
Tagging package [spacewalk-setup] version [1.7.7-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.7.34-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.7.7-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 2 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9955fdfed973560dfa60a11dc460cba62ea65a0d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 10:54:43 2012 +0100
Automatic commit of package [spacewalk-setup] release [1.7.7-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 39294fc..d33bd10 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.7.6-1 spacewalk/setup/
+1.7.7-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 4a51962..545cb83 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.7.6
+Version: 1.7.7
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 Jan Pazdziora 1.7.7-1
+- Make sure /etc/cobbler/settings has 644.
+
* Mon Feb 20 2012 Jan Pazdziora 1.7.6-1
- The valid_countries_tl has no en records and its columns are not used in the
select anyway.
12 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.7.34-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.7.34-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-02-28 09:54 +0000
Tagging package [spacewalk-backend] version [1.7.34-1] in directory [backend/].
Changes since spacewalk-schema-1.7.45-1:
Jan Pazdziora (3):
Avoid vn_rhnpackageevr_epoch violation.
Make sure /etc/cobbler/settings has 644.
Automatic commit of package [spacewalk-backend] release [1.7.34-1].
Milan Zazrivec (1):
create equivalent (empty) files for postgresql
Tomas Lestach (1):
fixing oracle equivalent source sha1s for upgrade scripts 081-092
---
backend/server/rhnServer/server_kickstart.py | 3 +--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
schema/spacewalk/postgres/procs/insert_checksum.sql | 2 ++
schema/spacewalk/postgres/procs/insert_client_capability.sql | 2 ++
schema/spacewalk/postgres/procs/insert_config_filename.sql | 2 ++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql | 2 +-
spacewalk/setup/bin/cobbler-setup | 4 +++-
18 files changed, 26 insertions(+), 16 deletions(-)
---
12 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 377296864a562f7dd0bf16f7fa2d684896fe217c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 10:54:16 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.7.34-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 962c853..fa98bc9 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.33
+Version: 1.7.34
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 Jan Pazdziora 1.7.34-1
+- Avoid vn_rhnpackageevr_epoch violation.
+
* Mon Feb 27 2012 Simon Lukasik <slukasik(a)redhat.com> 1.7.33-1
- OpenSCAP integration -- Backend API interface. (slukasik(a)redhat.com)
- convert empty string to NULL for postgresql (michael.mraka(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 609b0da..d04c345 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.7.33-1 backend/
+1.7.34-1 backend/
12 years, 2 months
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/bin/cobbler-setup | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3c3a1f678f373e00daa97199690b0dea54953417
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 10:41:22 2012 +0100
Make sure /etc/cobbler/settings has 644.
Addressing
> File "/usr/lib/python2.4/site-packages/cobbler/templar.py", line 29, in ?
> from template_api import Template
> File "/usr/lib/python2.4/site-packages/cobbler/template_api.py", line 42, in ?
> raise CX("/etc/cobbler/settings is not a valid YAML file")
> CX: '/etc/cobbler/settings is not a valid YAML file'
after upgrade with umask 0077.
diff --git a/spacewalk/setup/bin/cobbler-setup b/spacewalk/setup/bin/cobbler-setup
index b8744c4..e8ba1ce 100755
--- a/spacewalk/setup/bin/cobbler-setup
+++ b/spacewalk/setup/bin/cobbler-setup
@@ -4,7 +4,7 @@ from Cheetah.Template import Template
from socket import gethostbyname, gethostname
import shutil
from os.path import exists, join, dirname, basename, isdir, isfile
-from os import system
+from os import system, chmod
import sys
import re
@@ -62,7 +62,9 @@ def main():
gen_template(SETTINGS_TEMPLATE, answers, TEMP_SETTINGS)
gen_template(MODULES_TEMPLATE, answers, TEMP_MODULES)
copy(TEMP_SETTINGS, SETTINGS)
+ chmod(SETTINGS, 0644)
copy(TEMP_MODULES, MODULES)
+ chmod(MODULES, 0644)
m = re.compile(r"^cobbler\.host\s*=\s*", re.MULTILINE)
conf_lines = open(rhnConfig._CONFIG_FILE).read()
12 years, 2 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/postgres/procs/insert_checksum.sql | 2 ++
schema/spacewalk/postgres/procs/insert_client_capability.sql | 2 ++
schema/spacewalk/postgres/procs/insert_config_filename.sql | 2 ++
3 files changed, 6 insertions(+)
New commits:
commit 13bb7b11678159fe6cc1b5eab0b1ebb7fa31a5bb
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Feb 28 10:10:44 2012 +0100
create equivalent (empty) files for postgresql
diff --git a/schema/spacewalk/postgres/procs/insert_checksum.sql b/schema/spacewalk/postgres/procs/insert_checksum.sql
new file mode 100644
index 0000000..37a950b
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_checksum.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 874b297c5c4a19955e360cfd5dfbd3f7eaa07e3d
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/insert_client_capability.sql b/schema/spacewalk/postgres/procs/insert_client_capability.sql
new file mode 100644
index 0000000..cee1ab9
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_client_capability.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 91d69cea4721c434318c724367aad2da26fc580a
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/postgres/procs/insert_config_filename.sql b/schema/spacewalk/postgres/procs/insert_config_filename.sql
new file mode 100644
index 0000000..3aac031
--- /dev/null
+++ b/schema/spacewalk/postgres/procs/insert_config_filename.sql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 6246cca388a689f557ae46b817b61f647604e261
+-- This file is intentionally left empty.
12 years, 2 months
backend/server
by Jan Pazdziora
backend/server/rhnServer/server_kickstart.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 85d91dbf08d4b18aa82ec3328438316c0dcadbc7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 28 10:10:09 2012 +0100
Avoid vn_rhnpackageevr_epoch violation.
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index 7ba167b..0eca170 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -580,8 +580,7 @@ def _packages_from_cursor(cursor):
# We ignore GPG public keys since they are too weird to schedule
# as a package delta
continue
- result.append((p_name, row['version'], row['release'],
- row['epoch'] or ''))
+ result.append((p_name, row['version'], row['release'], row['epoch']))
return result
_query_lookup_pending_kickstart_sessions = rhnSQL.Statement("""
12 years, 2 months
schema/spacewalk
by Tomas Lestach
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit d94808fe70ec5f5f09dc91cdeae75d5ca505e891
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 08:26:09 2012 +0100
fixing oracle equivalent source sha1s for upgrade scripts 081-092
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql
index 5237e47..4051400 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/081-rhnActionScap.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 04aaac23861d5f56b412b080009e8b47addbc70d
+-- oracle equivalent source sha1 1f53d7b156e1e935fa6d333343cb7bc4d2d54ee3
CREATE TABLE rhnActionScap
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql
index a09a596..b1e8042 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/082-rhnXccdfBenchmark.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 3816bc60a7a51a9b8195fa54077215b7e9fe00b5
+-- oracle equivalent source sha1 47568aba3308c5897cea2c34575c867ba0feb937
CREATE TABLE rhnXccdfBenchmark
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql
index f05177b..898f014 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/083-rhnXccdfProfile.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 b02413a644b20ae1f8125c2cc952b3aa2629b915
+-- oracle equivalent source sha1 09965fbf1cdc6ee6351b0c6d62758f55c248b633
CREATE TABLE rhnXccdfProfile
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql
index b422105..a167948 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/084-rhnXccdfIdentsystem.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 da38af7476829b03a79aba148ca710b0a40ae40a
+-- oracle equivalent source sha1 dec03267384d905f2ad7b40fe32a1c990dd9650a
CREATE TABLE rhnXccdfIdentsystem
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql
index 53408bb..dec4e52 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/085-rhnXccdfIdent.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 3dfd1ac361743035c22d03f250713d9c60689102
+-- oracle equivalent source sha1 d00ed07219497daa0e99514be853132f4b8b7f67
CREATE TABLE rhnXccdfIdent
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql
index 81f42cc..4ac03c1 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/086-rhnXccdfTestresult.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 0cdc9f9284b139e82e8edbe5be8f0da155c36870
+-- oracle equivalent source sha1 4ffa783fd3c843b3080e81fe102f694b32910f3b
CREATE TABLE rhnXccdfTestresult
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql
index 0702af1..3e62434 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/087-rhnXccdfRuleresultType.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 3ffc2d45261e6fe07bb990206e5c0efdbcaf0561
+-- oracle equivalent source sha1 fece009c34376cc05329281ca6e76959a5e3a18c
CREATE TABLE rhnXccdfRuleresultType
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql
index 1e51b26..969762ad 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/089-rhnXccdfRuleresult.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 43c723fb63e07b88898d873e018edcb9b69a3223
+-- oracle equivalent source sha1 4914e7f1dc6e3c13928d0b0b7514cacab2f0c70a
CREATE TABLE rhnXccdfRuleresult
(
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql
index 3d2a538..68f03c3 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/090-lookup_xccdf_benchmark.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 ce2c38efd7de9640b9338173f385ffb26d70b053
+-- oracle equivalent source sha1 06ad4b545e7af5b6b04329939b658b4cc4fc725b
CREATE OR REPLACE FUNCTION
lookup_xccdf_benchmark(identifier_in IN VARCHAR, version_in IN VARCHAR)
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql
index 8ba97a7..cc61214 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/091-lookup_xccdf_profile.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 1865b4640fb444ac71304968fbc34e8d03454d44
+-- oracle equivalent source sha1 5d0f21052fcc2d1b6ba7c5697989ae60fe0a73a0
CREATE OR REPLACE FUNCTION
lookup_xccdf_profile(identifier_in IN VARCHAR, title_in IN VARCHAR)
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql
index 3674bb6..ebd47c8 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/092-lookup_xccdf_ident.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 c53a7de29f22c4ae4b9db65c7355dd5b6075adef
+-- oracle equivalent source sha1 c4e4389b599d4186dfe59d3f5432233d8faf0a49
CREATE OR REPLACE FUNCTION
lookup_xccdf_ident(system_in IN VARCHAR, identifier_in IN VARCHAR)
12 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.7.45-1'
by Šimon Lukašík
Tag 'spacewalk-schema-1.7.45-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2012-02-27 22:41 +0000
Tagging package [spacewalk-schema] version [1.7.45-1] in directory [schema/spacewalk/].
Changes since spacewalk-oscap-0.0.2-1:
Simon Lukasik (2):
Correct sha1sum of oracle equivalents
Automatic commit of package [spacewalk-schema] release [1.7.45-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/postgres/procs/lookup_xccdf_benchmark.sql | 86 -------------
schema/spacewalk/postgres/procs/lookup_xccdf_ident.sql | 2
schema/spacewalk/postgres/procs/lookup_xccdf_profile.sql | 2
schema/spacewalk/spacewalk-schema.spec | 5
5 files changed, 8 insertions(+), 89 deletions(-)
---
12 years, 2 months