spacecmd/src
by shardy
spacecmd/src/lib/kickstart.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b26a75b58ee11f3cf6f9abd5a898889acb89a189
Author: Steven Hardy <shardy(a)redhat.com>
Date: Fri Jul 6 14:00:43 2012 +0100
spacecmd : Fix kickstart_export with old API versions
Workaround kickstart_export problems when used with old
API version (satellite 5.3)
Based-on-patch-by: Alan Fitton <ajf(a)redhat.com>
Signed-off-by: Steven Hardy <shardy(a)redhat.com>
diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py
index a28dfa5..9a8c192 100644
--- a/spacecmd/src/lib/kickstart.py
+++ b/spacecmd/src/lib/kickstart.py
@@ -1879,9 +1879,12 @@ def export_kickstart_getdetails(self, profile, kickstarts):
details['partitioning_scheme'] = \
self.client.kickstart.profile.system.getPartitioningScheme(\
self.session, profile)
- details['reg_type'] = \
- self.client.kickstart.profile.system.getRegistrationType(self.session,\
+ if self.check_api_version('10.11'):
+ details['reg_type'] = \
+ self.client.kickstart.profile.system.getRegistrationType(self.session,
profile)
+ else:
+ details['reg_type'] = "none"
details['config_mgmt'] = \
self.client.kickstart.profile.system.checkConfigManagement(\
self.session, profile)
10 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.105-1'
by StephenHerr
Tag 'spacewalk-java-1.8.105-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-07-05 19:53 +0000
Tagging package [spacewalk-java] version [1.8.105-1] in directory [java/].
Changes since spacewalk-certs-tools-1.8.2-1:
Nigel Jones (1):
837913 - work around for if hibernate loads a clonedchannel as its own original
Stephen Herr (1):
Automatic commit of package [spacewalk-java] release [1.8.105-1].
---
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 6 +++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
---
10 years, 1 month
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 6 +++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 0527641b50e7a3eb8e831d7191d3b379af0fec17
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 5 15:53:04 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.105-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5d0f0b5..fabf9c5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.104
+Version: 1.8.105
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.105-1
+- 837913 - work around for if hibernate loads a clonedchannel as its own
+ original
+
* Fri Jun 29 2012 Stephen Herr <sherr(a)redhat.com> 1.8.104-1
- 836656 - Allow user to set MAC Address when provisioning a virtual guest
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 50707cf..1e16238 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.104-1 java/
+1.8.105-1 java/
commit 1e1aaa778a2c9e463b5df8288742bf8907411ccf
Author: Nigel Jones <nigjones(a)redhat.com>
Date: Thu Jul 5 15:51:59 2012 -0400
837913 - work around for if hibernate loads a clonedchannel as its own original
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 2413af9..134aac6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -42,6 +42,7 @@ public class ClonedChannel extends Channel {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isCloned() {
return true;
}
@@ -51,7 +52,10 @@ public class ClonedChannel extends Channel {
*/
@Override
public ChecksumType getChecksumType() {
- if (super.getChecksumType() == null) {
+ // We can reach a StackOverflow here if the current channel is also the
+ // original. Happening because of a Hibernate problem. See BZ 837913.
+ if (super.getChecksumType() == null &&
+ !super.getLabel().equals(getOriginal().getLabel())) {
// if the checksum type is not set use the
//checksum of original channel instead.
setChecksumType(getOriginal().getChecksumType());
10 years, 1 month
Changes to 'refs/tags/spacewalk-schema-1.8.58-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.58-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-04 10:06 +0000
Tagging package [spacewalk-schema] version [1.8.58-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.8.46-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.8.58-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
10 years, 1 month
Changes to 'refs/tags/spacewalk-certs-tools-1.8.2-1'
by Jan Pazdziora
Tag 'spacewalk-certs-tools-1.8.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-04 10:06 +0000
Tagging package [spacewalk-certs-tools] version [1.8.2-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-backend-1.8.46-1:
Jan Pazdziora (2):
Automatic commit of package [spacewalk-schema] release [1.8.58-1].
Automatic commit of package [spacewalk-certs-tools] release [1.8.2-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +++++-
4 files changed, 13 insertions(+), 4 deletions(-)
---
10 years, 1 month
2 commits - rel-eng/packages schema/spacewalk spacewalk/certs-tools
by Jan Pazdziora
rel-eng/packages/spacewalk-certs-tools | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +++++-
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 9d0d6315be2446f5b97a6db4b8074c454a15fd93
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 4 12:06:38 2012 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.8.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 3292bdf..df1df8f 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.8.1-1 spacewalk/certs-tools/
+1.8.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index ea251df..ad44ac0 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Jul 04 2012 Jan Pazdziora 1.8.2-1
+- 693290 - observe the --set-hostname parameter.
+- %%defattr is not needed since rpm 4.4
+
* Wed Mar 21 2012 Jan Pazdziora 1.8.1-1
- Always regenerate server.pem for jabberd.
commit b4a9e393dd9cb3452a24a20b6f8b409e7eb771b1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 4 12:06:29 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.58-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index da74957..73d3bd2 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.57-1 schema/spacewalk/
+1.8.58-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 4054db1..deff4a5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.57
+Version: 1.8.58
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jul 04 2012 Jan Pazdziora 1.8.58-1
+- We mustn't serialize object into string in lookup_evr, we need to only create
+ it once within the link.
+- 836656 - Allow user to set MAC Address when provisioning a virtual guest
+
* Fri Jun 29 2012 Jan Pazdziora 1.8.57-1
- Make the resulting data order more deterministic.
10 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.8.46-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.46-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-04 10:05 +0000
Tagging package [spacewalk-backend] version [1.8.46-1] in directory [backend/].
Changes since rhn-client-tools-1.8.10-1:
Jan Pazdziora (4):
Make sure even upgrades from 1.8.33 remove spacewalk-backend-xp.
We mustn't serialize object into string in lookup_evr, we need to only create it once within the link.
693290 - observe the --set-hostname parameter.
Automatic commit of package [spacewalk-backend] release [1.8.46-1].
---
backend/spacewalk-backend.spec | 7 -
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/postgres/procs/lookup_evr.sql | 13 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.postgresql | 55 ++++++++++
spacewalk/certs-tools/sslToolConfig.py | 3
6 files changed, 70 insertions(+), 11 deletions(-)
---
10 years, 1 month
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 62532be5ad6bf338c6dc9967b4e431e5b5013056
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 4 12:05:40 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3d37dfb..3b10f42 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.8.45
+Version: 1.8.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jul 04 2012 Jan Pazdziora 1.8.46-1
+- Make sure even upgrades from 1.8.33 remove spacewalk-backend-xp.
+
* Thu Jun 28 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.45-1
- 765816 - file mode have to be string
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 42cd5a4..49f850c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.45-1 backend/
+1.8.46-1 backend/
10 years, 1 month
spacewalk/certs-tools
by Jan Pazdziora
spacewalk/certs-tools/sslToolConfig.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit eb03cacd442bc4819a9f62c16fb23a0adb169148
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 4 12:03:17 2012 +0200
693290 - observe the --set-hostname parameter.
diff --git a/spacewalk/certs-tools/sslToolConfig.py b/spacewalk/certs-tools/sslToolConfig.py
index 11afaaf..161a8d1 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -312,7 +312,8 @@ def figureDEFS_distinguishing(options):
DEFS['--set-org-unit'] = getOption(options, 'set_org_unit')
if getOption(options, 'set_common_name') is not None:
DEFS['--set-common-name'] = getOption(options, 'set_common_name')
- # NOTE: --set-hostname set in figureDEFS_dirs()
+ if getOption(options, 'set_hostname') is not None:
+ DEFS['--set-hostname'] = getOption(options, 'set_hostname')
if getOption(options, 'set_email') is not None:
DEFS['--set-email'] = getOption(options, 'set_email')
DEFS['--set-cname'] = getOption(options, 'set_cname') # this is list
10 years, 1 month
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/procs/lookup_evr.sql | 13 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.postgresql | 55 ++++++++++
3 files changed, 62 insertions(+), 7 deletions(-)
New commits:
commit d13b56bc04cb17f7f7cf2ca40b98602547f85adb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jul 4 11:06:32 2012 +0200
We mustn't serialize object into string in lookup_evr, we need to only create it once within the link.
Addressing
2012-07-04 04:51:53.605 EDT ERROR: column "'1.4 REV=2006.03.29'" does not exist at character 114
2012-07-04 04:51:53.605 EDT STATEMENT: insert into rhnPackageEVR(id, epoch, version, release, evr) values (1158, NULL, '1.4 REV=2006.03.29', '1', (NULL,"'1.4 REV=2006.03.29'",'1'))
diff --git a/schema/spacewalk/postgres/procs/lookup_evr.sql b/schema/spacewalk/postgres/procs/lookup_evr.sql
index af24ae7..a21c795 100644
--- a/schema/spacewalk/postgres/procs/lookup_evr.sql
+++ b/schema/spacewalk/postgres/procs/lookup_evr.sql
@@ -30,16 +30,15 @@ begin
if not found then
evr_id := nextval('rhn_pkg_evr_seq');
+ declare
+ e_text varchar = coalesce(quote_literal(e_in), 'NULL');
+ v_text varchar = coalesce(quote_literal(v_in), 'NULL');
+ r_text varchar = coalesce(quote_literal(r_in), 'NULL');
begin
perform pg_dblink_exec(
'insert into rhnPackageEVR(id, epoch, version, release, evr) values (' ||
- evr_id || ', ' ||
- coalesce(quote_literal(e_in), 'NULL') || ', ' ||
- coalesce(quote_literal(v_in), 'NULL') || ', ' ||
- coalesce(quote_literal(r_in), 'NULL') || ', ' ||
- evr_t(coalesce(quote_literal(e_in), 'NULL'),
- coalesce(quote_literal(v_in), 'NULL'),
- coalesce(quote_literal(r_in), 'NULL')) || ')'
+ evr_id || ', ' || e_text || ', ' || v_text || ', ' || r_text
+ || ', evr_t(' || e_text || ', ' || v_text || ', ' || r_text || '))'
);
exception when unique_violation then
select id
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.postgresql
new file mode 100644
index 0000000..9eb5055
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/110-lookup_evr.sql.postgresql
@@ -0,0 +1,55 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+--
+-- 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_evr(e_in in varchar, v_in in varchar, r_in in varchar)
+returns numeric
+as
+$$
+declare
+ evr_id numeric;
+begin
+ select id
+ into evr_id
+ from rhnPackageEVR
+ where ((epoch is null and e_in is null) or (epoch = e_in)) and
+ version = v_in and
+ release = r_in;
+
+ if not found then
+ evr_id := nextval('rhn_pkg_evr_seq');
+ declare
+ e_text varchar = coalesce(quote_literal(e_in), 'NULL');
+ v_text varchar = coalesce(quote_literal(v_in), 'NULL');
+ r_text varchar = coalesce(quote_literal(r_in), 'NULL');
+ begin
+ perform pg_dblink_exec(
+ 'insert into rhnPackageEVR(id, epoch, version, release, evr) values (' ||
+ evr_id || ', ' || e_text || ', ' || v_text || ', ' || r_text
+ || ', evr_t(' || e_text || ', ' || v_text || ', ' || r_text || '))'
+ );
+ exception when unique_violation then
+ select id
+ into strict evr_id
+ from rhnPackageEVR
+ where ((epoch is null and e_in is null) or (epoch = e_in)) and
+ version = v_in and
+ release = r_in;
+ end;
+ end if;
+
+ return evr_id;
+end;
+$$ language plpgsql immutable;
10 years, 1 month