Changes to 'refs/tags/spacewalk-schema-1.6.22-1'
by Michael Mraka
Tag 'spacewalk-schema-1.6.22-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-10-18 10:02 +0000
Tagging package [spacewalk-schema] version [1.6.22-1] in directory [schema/spacewalk/].
Changes since spacewalk-proxy-1.6.4-1:
Michael Mraka (4):
rhnContentSourceFilter stores package filters for repos
package filters can be stored in database now
upgrade scripts for rhnContentSourceFilter
Automatic commit of package [spacewalk-schema] release [1.6.22-1].
---
backend/satellite_tools/reposync.py | 31 +++++--
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/rhnContentSourceFilter.sql | 43 ++++++++++
schema/spacewalk/spacewalk-schema.spec | 5 -
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.oracle | 26 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.postgresql | 26 ++++++
6 files changed, 122 insertions(+), 11 deletions(-)
---
12 years, 8 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7b01d5c30a766e2d220e33d5f1c04eafb4852c1b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 18 12:02:51 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.22-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 37e79da..1248247 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.21-1 schema/spacewalk/
+1.6.22-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index b248222..46b8953 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.6.21
+Version: 1.6.22
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Oct 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.22-1
+- rhnContentSourceFilter stores package filters for repos
+
* Thu Oct 13 2011 Jan Pazdziora 1.6.21-1
- Unspecified SHA1s have to be reported for upgrades.
12 years, 8 months
3 commits - backend/satellite_tools schema/spacewalk
by Michael Mraka
backend/satellite_tools/reposync.py | 31 +++++--
schema/spacewalk/common/tables/rhnContentSourceFilter.sql | 43 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.oracle | 26 ++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.postgresql | 26 ++++++
4 files changed, 117 insertions(+), 9 deletions(-)
New commits:
commit c3a7774643b88d283ca8a00be8555007cf6b48fc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 18 12:01:49 2011 +0200
upgrade scripts for rhnContentSourceFilter
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.oracle
new file mode 100644
index 0000000..6b54b98
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.oracle
@@ -0,0 +1,26 @@
+
+create table
+rhnContentSourceFilter
+(
+ id number NOT NULL
+ constraint rhn_csf_id_pk primary key,
+ source_id number
+ constraint rhn_csf_source_fk
+ references rhnContentSource (id),
+ sort_order number NOT NULL,
+ flag varchar2(1) NOT NULL
+ check (flag in ('+','-')),
+ filter varchar2(4000) NOT NULL,
+ created date default(sysdate) NOT NULL,
+ modified date default(sysdate) NOT NULL
+)
+ enable row movement
+ ;
+
+
+create sequence rhn_csf_id_seq start with 500;
+
+CREATE UNIQUE INDEX rhn_csf_sid_so_uq
+ ON rhnContentSourceFilter (source_id, sort_order)
+ tablespace [[64k_tbs]];
+
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.postgresql
new file mode 100644
index 0000000..343f9e9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/100-rhnContentSourceFilter.sql.postgresql
@@ -0,0 +1,26 @@
+-- oracle equivalent source sha1 0e0ca0d6001351252e3ffb14a5f0a9a806ac352d
+
+create table
+rhnContentSourceFilter
+(
+ id numeric NOT NULL
+ constraint rhn_csf_id_pk primary key,
+ source_id numeric
+ constraint rhn_csf_source_fk
+ references rhnContentSource (id),
+ sort_order numeric NOT NULL,
+ flag varchar(1) NOT NULL
+ check (flag in ('+','-')),
+ filter varchar(4000) NOT NULL,
+ created date default current_timestamp NOT NULL,
+ modified date default current_timestamp NOT NULL
+)
+ ;
+
+
+create sequence rhn_csf_id_seq start with 500;
+
+CREATE UNIQUE INDEX rhn_csf_sid_so_uq
+ ON rhnContentSourceFilter (source_id, sort_order)
+ ;
+
commit 0f0c0cc7eade81b71f21b3fee4a442813ff6d217
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 18 11:41:13 2011 +0200
package filters can be stored in database now
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 580b585..2ba1d7d 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -76,7 +76,7 @@ class RepoSync:
if not options.url:
if options.channel_label:
# TODO:need to look at user security across orgs
- h = rhnSQL.prepare("""select s.source_url
+ h = rhnSQL.prepare("""select s.id, s.source_url
from rhnContentSource s,
rhnChannelContentSource cs,
rhnChannel c
@@ -84,14 +84,14 @@ class RepoSync:
and cs.channel_id = c.id
and c.label = :label""")
h.execute(label=options.channel_label)
- source_urls = h.fetchall_dict() or []
- if source_urls:
- self.urls = [row['source_url'] for row in source_urls]
+ source_data = h.fetchall_dict() or []
+ if source_data:
+ self.urls = [(row['id'], row['source_url']) for row in source_data]
else:
quit = True
self.error_msg("Channel has no URL associated")
else:
- self.urls = [options.url]
+ self.urls = [(None, options.url)]
if not options.channel_label:
quit = True
self.error_msg("--channel must be specified")
@@ -115,9 +115,9 @@ class RepoSync:
sys.exit(1)
start_time = datetime.now()
- for url in self.urls:
+ for (id, url) in self.urls:
plugin = self.load_plugin()(url, self.channel_label)
- self.import_packages(plugin, url)
+ self.import_packages(plugin, id, url)
self.import_updates(plugin, url)
if self.regen:
taskomatic.add_to_repodata_queue_for_channel_package_subscription(
@@ -321,8 +321,21 @@ class RepoSync:
importer.run()
self.regen = True
- def import_packages(self, plug, url):
- packages = plug.list_packages(self.filters)
+ def import_packages(self, plug, source_id, url):
+ if (not self.filters) and source_id:
+ h = rhnSQL.prepare("""
+ select flag, filter
+ from rhnContentSourceFilter
+ where source_id = :source_id
+ order by sort_order """)
+ h.execute(source_id = source_id)
+ filter_data = h.fetchall_dict() or []
+ filters = [(row['flag'], re.split('[,\s]+', row['filter']))
+ for row in filter_data]
+ else:
+ filters = self.filters
+
+ packages = plug.list_packages(filters)
to_process = []
num_passed = len(packages)
self.print_msg("Repo URL: %s" % url)
commit c115a74d361d13592fed634bd2de7b5a1613f3ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 18 11:45:23 2011 +0200
rhnContentSourceFilter stores package filters for repos
diff --git a/schema/spacewalk/common/tables/rhnContentSourceFilter.sql b/schema/spacewalk/common/tables/rhnContentSourceFilter.sql
new file mode 100644
index 0000000..9836f6f
--- /dev/null
+++ b/schema/spacewalk/common/tables/rhnContentSourceFilter.sql
@@ -0,0 +1,43 @@
+--
+-- 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 table
+rhnContentSourceFilter
+(
+ id number NOT NULL
+ constraint rhn_csf_id_pk primary key,
+ source_id number
+ constraint rhn_csf_source_fk
+ references rhnContentSource (id),
+ sort_order number NOT NULL,
+ flag varchar2(1) NOT NULL
+ check (flag in ('+','-')),
+ filter varchar2(4000) NOT NULL,
+ created date default(sysdate) NOT NULL,
+ modified date default(sysdate) NOT NULL
+)
+ enable row movement
+ ;
+
+
+create sequence rhn_csf_id_seq start with 500;
+
+CREATE UNIQUE INDEX rhn_csf_sid_so_uq
+ ON rhnContentSourceFilter (source_id, sort_order)
+ tablespace [[64k_tbs]];
+
12 years, 8 months
Changes to 'refs/tags/spacewalk-proxy-1.6.4-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.6.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-10-17 15:40 +0000
Tagging package [spacewalk-proxy] version [1.6.4-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-1.6.32-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-proxy] release [1.6.4-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 8 months
proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 68df99af73f44437991c96615e66dc3324cfe470
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 17 17:40:26 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.6.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 2e73e0d..990795f 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -320,6 +320,9 @@ fi
%changelog
+* Mon Oct 17 2011 Miroslav Suchý 1.6.4-1
+- 719659 - correctly handle getpeername() on IPv6
+
* Fri Sep 30 2011 Jan Pazdziora 1.6.3-1
- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (proxy).
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index bad2def..58fbc09 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.6.3-1 proxy/proxy/
+1.6.4-1 proxy/proxy/
12 years, 8 months
Changes to 'refs/tags/spacewalk-backend-1.6.32-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.6.32-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-17 15:11 +0000
Tagging package [spacewalk-backend] version [1.6.32-1] in directory [backend/].
Changes since spacewalk-java-1.6.62-1:
Ionuț Arțăriși (1):
add an 'xmlrpc.errata.patch_names' capability
Jan Pazdziora (2):
600555 - removing the Management word from the error message because it is not Management entitlements we might be having problems with.
Automatic commit of package [spacewalk-backend] release [1.6.32-1].
Miroslav Suchý (1):
719659 - correctly handle getpeername() on IPv6
---
backend/server/rhnCapability.py | 1 +
backend/server/rhnServer/server_token.py | 2 +-
backend/spacewalk-backend.spec | 8 +++++++-
proxy/proxy/rhnShared.py | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 12 insertions(+), 5 deletions(-)
---
12 years, 8 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 3f363c40651c1707ad41ae55aa791d593345a532
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 17 17:11:42 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.32-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b23b44d..d9f0f94 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 and Python
-Version: 1.6.31
+Version: 1.6.32
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Oct 17 2011 Jan Pazdziora 1.6.32-1
+- add an 'xmlrpc.errata.patch_names' capability (iartarisi(a)suse.cz)
+- 600555 - removing the Management word from the error message because it is
+ not Management entitlements we might be having problems with.
+- consistent spacing (mzazrivec(a)redhat.com)
+
* Fri Oct 14 2011 Martin Minar <mminar(a)redhat.com> 1.6.31-1
- 745102 - if ip address is not set, convert "" to null (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0aeff8d..598ba85 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.31-1 backend/
+1.6.32-1 backend/
12 years, 8 months
backend/server
by Jan Pazdziora
backend/server/rhnCapability.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 9da7323af775c288af8dc9c436c3e3da007a509b
Author: Ionuț Arțăriși <iartarisi(a)suse.cz>
Date: Mon Oct 17 16:43:55 2011 +0200
add an 'xmlrpc.errata.patch_names' capability
This capability corresponds to the getErrataNamesById action in
xmlrpc.errata. zypp-plugin-spacewalk depends on it for installing SUSE
patches as patches instead of individual packages (i.e. zypper install
patch:PatchName1 patch:PatchName2)
diff --git a/backend/server/rhnCapability.py b/backend/server/rhnCapability.py
index fef1f32..5ac0fc6 100644
--- a/backend/server/rhnCapability.py
+++ b/backend/server/rhnCapability.py
@@ -186,6 +186,7 @@ def _set_server_capabilities():
'rhncfg.content.base64_decode' : {'version' : 1, 'value' : 1},
'rhncfg.filetype.directory' : {'version' : 1, 'value' : 1},
'xmlrpc.packages.extended_profile' : {'version' : '1-2', 'value' : 1},
+ 'xmlrpc.errata.patch_names' : {'version' : 1, 'value' : 1},
'staging_content' : {'version' : 1, 'value' : 1},
'ipv6' : {'version' : 1, 'value' : 1},
}
12 years, 8 months
backend/server
by Jan Pazdziora
backend/server/rhnServer/server_token.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 03eae8bd77ab285b69b26bb5ffa12808a29b77c0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 17 16:31:09 2011 +0200
600555 - removing the Management word from the error message because it is not Management entitlements we might be having problems with.
diff --git a/backend/server/rhnServer/server_token.py b/backend/server/rhnServer/server_token.py
index 29bbcb0..27dc4d3 100644
--- a/backend/server/rhnServer/server_token.py
+++ b/backend/server/rhnServer/server_token.py
@@ -642,7 +642,7 @@ class ActivationTokens:
#ORA-20220: (servergroup_max_members) - Server group membership
#cannot exceed maximum membership
raise rhnFault(91,
- _("Registration failed: RHN Software Management service entitlements exhausted")), None, sys.exc_info()[2]
+ _("Registration failed: RHN Software service entitlements exhausted: %s") % entitlement[0]), None, sys.exc_info()[2]
#No idea what error may be here...
raise rhnFault(90, e.errmsg), None, sys.exc_info()[2]
except rhnSQL.SQLError, e:
12 years, 8 months
proxy/proxy
by Miroslav Suchý
proxy/proxy/rhnShared.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 509d8c358a5f42c57522492948372742c13dbfc2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 17 16:26:30 2011 +0200
719659 - correctly handle getpeername() on IPv6
on IPv4 getpeername() returns (address, port), but on IPv6 it returns:
(address, port, flow info, scope id)
Since we are interrested only in first and second items, we have to address them
and not use whole list.
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index acdcf23..272619d 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -136,9 +136,9 @@ class SharedHandler:
log_debug(3, "HTTP proxy info: %s" % self.httpProxy)
else:
log_debug(3, "HTTP proxy info: not using an HTTP proxy")
+ peer = self.responseContext.getConnection().sock.getpeername()
log_debug(4, "Other connection info: %s:%s%s" %
- (self.responseContext.getConnection().sock.getpeername() + \
- (self.uri, )))
+ (peer[0], peer[1], self.uri))
def _create_connection(self):
""" Returns a Connection object """
12 years, 8 months