proxy/installer
by Dimitar Yordanov
proxy/installer/rhn_proxy_activate.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 7da0f03883e9b8e2d9b74304ac987981028c6e27
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 17:42:58 2013 +0200
979038 - Obtain default options from up2date
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index e4ec562..37597cd 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -33,6 +33,9 @@ import xmlrpclib
from rhn import rpclib, SSL
from optparse import Option, OptionParser
+sys.path.append('/usr/share/rhn')
+from up2date_client import config
+
DEFAULT_WEBRPC_HANDLER_v3_x = '/rpc/api'
def getSystemId():
@@ -402,16 +405,19 @@ def listAvailableProxyChannels(options):
sys.stdout.write("\n".join(channel_list)+"\n")
def processCommandline():
- # FIXME: we should populate this keys from /etc/sysconfig/rhn/up2date
- rhn_parent = ''
- httpProxy = ''
- httpProxyUsername = ''
- httpProxyPassword = ''
+
+ cfg = config.initUp2dateConfig()
+ up2date_cfg = dict(cfg.items())
+
+ rhn_parent = urlparse.urlparse(up2date_cfg['serverURL'][0])[1]
+ httpProxy = urlparse.urlparse(up2date_cfg['httpProxy'][0])[1]
+ httpProxyUsername = up2date_cfg['proxyUser']
+ httpProxyPassword = up2date_cfg['proxyPassword']
if not httpProxy:
httpProxyUsername, httpProxyPassword = '', ''
if not httpProxyUsername:
httpProxyPassword = ''
- ca_cert = ''
+ ca_cert = up2date_cfg['sslCACert']
defaultVersion = '5.2'
# parse options
@@ -423,7 +429,7 @@ def processCommandline():
Option('--http-proxy-username', action='store', default=httpProxyUsername,
help="alternative HTTP proxy usename, default is %s" % repr(httpProxyUsername)),
Option('--http-proxy-password', action='store', default=httpProxyPassword,
- help="alternative HTTP proxy password, default is %s" % repr(httpProxyUsername)),
+ help="alternative HTTP proxy password, default is %s" % repr(httpProxyPassword)),
Option('--ca-cert', action='store', default=ca_cert,
help="alternative SSL certificate to use, default is %s" % repr(ca_cert)),
Option('--no-ssl', action='store_true',
10 years, 9 months
utils/spacewalk-dump-schema
by Milan Zazrivec
utils/spacewalk-dump-schema | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e4116f0da7c97dfe6876d3f9c2c270ec2e75e296
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jun 27 16:26:16 2013 +0200
oracle -> pg migrations: filter plan_table_9i out
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index f582904..de3c409 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -157,7 +157,7 @@ sub process_scripts {
my $tables = $dbh->selectall_hashref(q!
select lower(table_name) table_name
from user_tables
- where table_name <> 'PLAN_TABLE' -- plan_table is not part of our schema
+ where table_name not in ('PLAN_TABLE', 'PLAN_TABLE_9I') -- plan_table is not part of our schema
order by table_name
!, 'table_name');
10 years, 9 months
Changes to 'refs/tags/rhn-client-tools-1.10.11-1'
by Dimitar Yordanov
Tag 'rhn-client-tools-1.10.11-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-06-27 11:03 +0000
Tagging package [rhn-client-tools] version [1.10.11-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.10.107-1:
Dimitar Yordanov (1):
Automatic commit of package [rhn-client-tools] release [1.10.11-1].
Pavel Studenik (1):
873784 - Multiple serverURL values could not end with semicolon
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2 +-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 9 months
client/rhel rel-eng/packages
by Dimitar Yordanov
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6b937b2d876e4d025f62785ab4b9af807cc71c50
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 13:03:25 2013 +0200
Automatic commit of package [rhn-client-tools] release [1.10.11-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 89fc35e..9b12701 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.10.10
+Version: 1.10.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -346,6 +346,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Jun 27 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.11-1
+- 873784 - Multiple serverURL values could not end with semicolon
+
* Wed Jun 19 2013 Jan Dobes 1.10.10-1
- 957506 - unicode support for Remote Command scripts
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 99d03c8..bde176e 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.10.10-1 client/rhel/rhn-client-tools/
+1.10.11-1 client/rhel/rhn-client-tools/
10 years, 9 months
client/rhel
by Dimitar Yordanov
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 40fd73721aeb447991d46a6f1bfb9290b509cb5f
Author: Pavel Studenik <pstudeni(a)redhat.com>
Date: Thu Jun 27 12:52:15 2013 +0200
873784 - Multiple serverURL values could not end with semicolon
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 34534a4..4c5c464 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -125,7 +125,7 @@ class ConfigFile:
else:
# there could be whitespace between the values on
# one line, let's strip it out
- value = [val.strip() for val in values[:-1]]
+ value = [val.strip() for val in values if val.strip() ]
# now insert the (comment, value) in the dictionary
newval = (comment, value)
10 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.10.107-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.107-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-06-27 09:52 +0000
Tagging package [spacewalk-java] version [1.10.107-1] in directory [java/].
Changes since spacewalk-schema-1.10.52-1:
Jan Dobes (2):
514223 - catching invalid ip to prevent ISE
Automatic commit of package [spacewalk-java] release [1.10.107-1].
---
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java | 11 +++++++++-
java/spacewalk-java.spec | 11 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 21 insertions(+), 3 deletions(-)
---
10 years, 9 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java | 11 +++++++++-
java/spacewalk-java.spec | 11 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit fc0887eeff55ee58f82c042f6bd230fbc5940345
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Jun 27 11:52:52 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.107-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e7ac0b9..9bfff93 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.106
+Version: 1.10.107
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jun 27 2013 Jan Dobes 1.10.107-1
+- 514223 - catching invalid ip to prevent ISE
+- removing @Override annotation from methods that aren't overriden
+- removing unnecessarily nested else clause
+- removing unnecessarily nested else clause
+- removing unnecessary casts
+- 976136 - we need unentitle channels before we delete them
+- 912931 - move taskomatic bunch logs to /var/log instead of /var/lib
+
* Tue Jun 25 2013 Grant Gainey 1.10.106-1
- Fix checkstyle issues
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dc7fd08..a6e2068 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.106-1 java/
+1.10.107-1 java/
commit 08ff97d391498d54c87b370158e647f794e1623f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Jun 27 11:34:23 2013 +0200
514223 - catching invalid ip to prevent ISE
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
index 9747f75..1987531 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.dto.kickstart.KickstartIpRangeDto;
import com.redhat.rhn.frontend.taglibs.list.BaseListFilter;
+import com.redhat.rhn.frontend.xmlrpc.InvalidIpAddressException;
import com.redhat.rhn.manager.kickstart.IpAddress;
import com.redhat.rhn.manager.kickstart.IpAddressRange;
@@ -51,7 +52,15 @@ public class KickstartIpRangeFilter extends BaseListFilter {
IpAddress min = new IpAddress(range.getMin());
IpAddress max = new IpAddress(range.getMax());
- return filterOnRange(criteria, min.toString(), max.toString());
+ boolean contained;
+ try {
+ contained = filterOnRange(criteria, min.toString(), max.toString());
+ }
+ catch (InvalidIpAddressException e) {
+ contained = false;
+ }
+
+ return contained;
}
10 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.10.52-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.10.52-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-27 07:51 +0000
Tagging package [spacewalk-schema] version [1.10.52-1] in directory [schema/spacewalk/].
Changes since rhncfg-5.10.54-1:
Milan Zazrivec (2):
fix sql syntax
Automatic commit of package [spacewalk-schema] release [1.10.52-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnISSSlave.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 9 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2c6094ab21c3333c39a1fe76b82502620aae06a2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jun 27 09:51:44 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.52-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 89ec6b0..dffd705 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.51-1 schema/spacewalk/
+1.10.52-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 10b5362..5d51ed0 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.51
+Version: 1.10.52
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Jun 27 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.52-1
+- fix sql syntax
+
* Wed Jun 26 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.51-1
- schema upgrades for rhnConfigRevision triggers
10 years, 9 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/common/tables/rhnISSSlave.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b9947816810a883fb9d7dd150282557736a8407c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jun 27 09:49:13 2013 +0200
fix sql syntax
diff --git a/schema/spacewalk/common/tables/rhnISSSlave.sql b/schema/spacewalk/common/tables/rhnISSSlave.sql
index 36f9838..1e60d26 100644
--- a/schema/spacewalk/common/tables/rhnISSSlave.sql
+++ b/schema/spacewalk/common/tables/rhnISSSlave.sql
@@ -2,7 +2,7 @@
create table rhnISSSlave (
id number not null constraint rhn_isss_id_pk primary key,
slave varchar2(512) not null constraint rhn_isss_name_uq unique,
- enabled char(1) not null default 'Y',
+ enabled char(1) default 'Y' not null
constraint rhn_isss_enabled_yn check (enabled in ( 'Y', 'N' )),
allow_all_orgs char(1) not null default 'Y',
constraint rhn_isss_allorgs_yn check (allow_all_orgs in ( 'Y', 'N' )),
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
index dfd56e4..3cbaa7c 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/022-rhnISSSlave.sql
@@ -1,7 +1,7 @@
create table rhnISSSlave (
id number not null constraint rhn_isss_id_pk primary key,
slave varchar2(512) not null constraint rhn_isss_name_uq unique,
- enabled char(1) not null default 'Y',
+ enabled char(1) default 'Y' not null
constraint rhn_isss_enabled_yn check (enabled in ( 'Y', 'N' )),
allow_all_orgs char(1) not null default 'Y',
constraint rhn_isss_allorgs_yn check (allow_all_orgs in ( 'Y', 'N' )),
10 years, 9 months