Changes to 'refs/tags/spacewalk-web-1.3.6-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.3.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-11-26 15:52 +0000
Tagging package [spacewalk-web] version [1.3.6-1] in directory [web/].
Changes since rhncfg-5.9.35-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.3.6-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1804dc2612f9c2b8c98223c69ee9cdabfc76236e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 26 16:52:14 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.6-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 569c23f..89b3ff3 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.5-1 web/
+1.3.6-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index fe3aeb8..2d3cf89 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Nov 26 2010 Jan Pazdziora 1.3.6-1
+- Fix handling of eval (DBD::Oracle).
+- 642285 - introducing disabled TaskStatus page (tlestach(a)redhat.com)
+
* Tue Nov 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.5-1
- fixed Notification Methods (PG)
13 years, 5 months
Changes to 'refs/tags/rhncfg-5.9.35-1'
by Jan Pazdziora
Tag 'rhncfg-5.9.35-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-11-26 15:50 +0000
Tagging package [rhncfg] version [5.9.35-1] in directory [client/tools/rhncfg/].
Changes since oracle-server-scripts-10.2.0.52-1:
Jan Pazdziora (4):
Fix handling of eval (DBD::Oracle).
656895 - Need to call startswith on string.
656895 - fixing other instances of two-parameter utils.startswith.
Automatic commit of package [rhncfg] release [5.9.35-1].
Tomas Lestach (8):
remove dead query from Action_queries
remove dead queries from Channel_queries
remove dead queries from General_queries
remove dead query from Org_queries
remove dead queries from System_queries
remove dead queries from test_queries
remove dead queries from User_queries
comment unused query in Task_queries
---
client/tools/rhncfg/config_common/rhn_main.py | 2
client/tools/rhncfg/config_management/rhncfg_add.py | 2
client/tools/rhncfg/config_management/rhncfg_diff.py | 6 -
client/tools/rhncfg/config_management/rhncfg_remove.py | 2
client/tools/rhncfg/config_management/rhncfg_upload_channel.py | 2
client/tools/rhncfg/rhncfg.spec | 6 +
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 --
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 24 -------
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 18 -----
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 10 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33 ----------
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 4 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml | 11 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 31 ---------
rel-eng/packages/rhncfg | 2
web/modules/rhn/RHN/DB.pm | 3
16 files changed, 18 insertions(+), 146 deletions(-)
---
13 years, 5 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b8dfc42f44eb326dc94b34fec29657fbf954e1bd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 26 16:50:12 2010 +0100
Automatic commit of package [rhncfg] release [5.9.35-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 3cf74c2..e6cc553 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.34
+Version: 5.9.35
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Nov 26 2010 Jan Pazdziora 5.9.35-1
+- 656895 - fixing other instances of two-parameter utils.startswith.
+- 656895 - Need to call startswith on string.
+
* Wed Nov 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.9.34-1
- removed unused imports
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index fd7f8d9..a1d9463 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.34-1 client/tools/rhncfg/
+5.9.35-1 client/tools/rhncfg/
13 years, 5 months
8 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 --
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 24 -------
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 18 -----
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 10 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33 ----------
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 4 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml | 11 ---
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 31 ---------
8 files changed, 3 insertions(+), 136 deletions(-)
New commits:
commit 9e24dd32583426fbf38de6eeb74e57076d80a56b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:32:01 2010 +0100
comment unused query in Task_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index e297fa2..603d2f7 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -299,6 +299,7 @@ SELECT id, channel_label, client, reason, force, bypass_filters, next_action
</write-mode>
<!-- timings: webdev: 6m (2 records), webqa: 1m 58s (3), prod: 3m 32s (697) -->
+<!--
<mode name="summarypop_awol_server_in_orgs"
class="com.redhat.rhn.frontend.dto.OrgIdWrapper">
<query params="checkin_threshold">
@@ -313,8 +314,9 @@ where sgt.label in ('enterprise_entitled', 'provisioning_entitled')
and (current_timestamp + numtodsinterval(1 + :checkin_threshold, 'day')
</query>
</mode>
-
+-->
<!-- timings: webdev: 3m 36s (2), webqa: 11s (3), prod: 3m 21s(697) -->
+
<mode name="summarypop_awol_server_in_orgs2"
class="com.redhat.rhn.frontend.dto.OrgIdWrapper">
<query params="checkin_threshold">
commit a3cb4dc36fb02425be96f6911b81de63f17e17b5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:28:10 2010 +0100
remove dead queries from User_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
index 28a2757..9b69f56 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml
@@ -298,17 +298,6 @@ SELECT system_group_id
</callable-mode>
<!-- The Following two procedures are managed by the web team, we simply call them -->
-<callable-mode name="disable_user">
- <query params="victim_id, admin_id">
- { call web_disable_user_pkg.disable_user(:victim_id, :admin_id) }
- </query>
-</callable-mode>
-
-<callable-mode name="enable_user">
- <query params="victim_id, admin_id">
- { call web_disable_user_pkg.reenable_user(:victim_id, :admin_id) }
- </query>
-</callable-mode>
<mode name="user_count">
<query params="">
commit aa311435f51940de3a9a55cf907d63aec110e43a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:23:24 2010 +0100
remove dead queries from test_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 542b93f..30b6efb 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -175,14 +175,6 @@ update rhnServerGroup set group_type = :type_id where id = :sgid
</query>
</callable-mode>
-<mode name="date_test">
- <query>
-SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
- FROM all_users u
- WHERE u.username='SYS'
- </query>
-</mode>
-
<mode name="date_dto_test" class="com.redhat.rhn.common.db.datasource.test.TestDateDto">
<query>
SELECT u.created as CREATED
@@ -373,22 +365,6 @@ SELECT *
</query>
</mode>
-<write-mode name="insert_into_notifications">
- <query params="id, org_id, contact_email_address">
-INSERT
- INTO web_customer_notification
-VALUES (:id, :org_id, :contact_email_address, sysdate)
- </query>
-</write-mode>
-
-<mode name="get_user_notification">
- <query params="id">
-SELECT *
- FROM web_customer_notification
- WHERE id = :id
- </query>
-</mode>
-
<mode name="get_daily_summary_queue">
<query params="">
SELECT * FROM rhnSummaryQueue
@@ -429,13 +405,6 @@ SELECT * from rhntransactionpackage where
</query>
</mode>
-<mode name="select_virtual_instance">
- <query params="sid">
-SELECT * FROM rhnVirtualInstance WHERE virtual_system_id = :sid OR
- host_system_id = :sid
- </query>
-</mode>
-
<mode name="select_virtual_instance_by_id">
<query params="id">
SELECT * FROM rhnVirtualInstance WHERE id = :id
commit b2e3f9c61943ec76c1269c2a09c07921d0e93b82
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 14:01:23 2010 +0100
remove dead queries from System_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 7661932..370d65c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -672,13 +672,6 @@ SELECT DISTINCT SP.server_id id,
</elaborator>
</mode>
-<write-mode name="insert_ssm_remove_server_package">
- <query params="user_id, name_id, evr_id, arch_id">
- INSERT INTO rhnSsmSystemPackages (user_id, name_id, evr_id, arch_id)
- VALUES (:user_id, :name_id, :evr_id, :arch_id)
- </query>
-</write-mode>
-
<mode name="out_of_date" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query params="org_id, user_id">
select * from (
@@ -1527,19 +1520,6 @@ SELECT 1
</query>
</mode>
-<write-mode name="delete_proxy_info">
- <query params="server_id">
-delete from rhnProxyInfo where server_id = :server_id
- </query>
-</write-mode>
-
-<write-mode name="insert_proxy_info">
- <query params="server_id, version">
-INSERT INTO rhnProxyInfo (server_id, proxy_evr_id)
- VALUES (:server_id, lookup_evr(NULL, :version, '1'))
- </query>
-</write-mode>
-
<callable-mode name="entitle_server">
<query params="sid, entitlement">
{call rhn_entitlements.entitle_server(:sid, :entitlement)}
@@ -1558,19 +1538,6 @@ INSERT INTO rhnProxyInfo (server_id, proxy_evr_id)
</query>
</callable-mode>
-<write-mode name="insert_satellite_info">
- <query params="sid, product, owner, issued_string, expiration_string,version">
-INSERT INTO rhnSatelliteInfo (server_id, cert, product, owner, issued_string, expiration_string, evr_id)
- VALUES (:sid, EMPTY_BLOB(), :product, :owner, :issued_string, :expiration_string, lookup_evr(NULL, :version, '1'))
- </query>
-</write-mode>
-
-<write-mode name="delete_satellite_info">
- <query params="sid">
-DELETE FROM rhnSatelliteInfo WHERE server_id = :sid
- </query>
-</write-mode>
-
<callable-mode name="remove_from_action">
<query params="server_id, action_id">
{call rhn_server.remove_action(:server_id, :action_id)}
commit 703ac99a43cfd011b3dc453797e898a6f70fefad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:48:57 2010 +0100
remove dead query from Org_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
index 86ef47e..3789f39 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
@@ -145,16 +145,6 @@ AND sg.org_id != 1
</query>
</mode>
-<mode name="get_used_org_counts">
- <query params="label">
- SELECT COUNT(sg.org_id) as orgsused
- FROM rhnServerGroup sg, rhnServerGroupMembers sgm, rhnServerGroupType sgt
- WHERE sg.GROUP_TYPE = sgt.id
- AND sgm.SERVER_GROUP_ID = sg.id
- AND sgt.label = :label
- </query>
-</mode>
-
<callable-mode name="delete_organization">
<query params="org_id">
{call rhn_org.delete_org(:org_id)}
commit 62d3bbe5552e59981629a72a6e09f0fc8ffb24d8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:48:16 2010 +0100
remove dead queries from General_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index b73b9b6..6f6be26 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -275,24 +275,6 @@ ORDER BY KTZ.name
</query>
</mode>
-<write-mode name="insert_set_for_label">
- <query params="user_id, label, element, element_two">
- INSERT
- INTO rhnSet
- (user_id, label, element, element_two)
- VALUES (:user_id, :label, :element, :element_two)
- </query>
-</write-mode>
-
-<write-mode name="delete_set_for_label">
- <query params="user_id, label">
- DELETE
- FROM rhnSet
- WHERE user_id = :user_id
- AND label = :label
- </query>
-</write-mode>
-
<write-mode name="update_current_alerts_date_completed">
<query>
UPDATE rhn_current_alerts
commit 80f65c260da01ee48c52f55d9f922d9d71cb610d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:42:52 2010 +0100
remove dead queries from Channel_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 52ec500..dff7094 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -862,25 +862,6 @@ ORDER BY UPPER(C.name)
</query>
</callable-mode>
-<write-mode name="flag_server_channels_changed">
- <query params="server_id">
- UPDATE rhnServer SET channels_changed = sysdate WHERE id = :server_id
- </query>
-</write-mode>
-
-<write-mode name="log_channel_history">
- <query params="server_id, channel_id, channel_label, message">
- INSERT INTO rhnServerHistory (id, server_id, summary, details) (
- SELECT rhn_event_id_seq.nextval,
- :server_id,
- :message,
- :channel_label
- FROM rhnChannel c
- WHERE c.id = :channel_id
- )
- </query>
-</write-mode>
-
<callable-mode name="unsubscribe_server_from_channel">
<query params="server_id, channel_id">
{call rhn_channel.unsubscribe_server(:server_id, :channel_id)}
@@ -1185,10 +1166,5 @@ END;
ORDER BY parent, name
</query>
</mode>
-<callable-mode name="can_convert_to_flex">
- <query params="result, sid, cfid">
- {:result = call rhn_channel.convert_to_fve(:sid, :cfid)}
- </query>
-</callable-mode>
</datasource_modes>
commit c4a0d1a18d8a244a64287918eeca0c9ed9f339e8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 26 13:36:43 2010 +0100
remove dead query from Action_queries
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index ee0de64..be03a6d 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -263,14 +263,6 @@ UPDATE rhnAction
</query>
</write-mode>
-<write-mode name="cancel_actions">
- <query params="server_id, action_id">
-BEGIN
- rhn_server.remove_action(:server_id, :action_id);
-END;
- </query>
-</write-mode>
-
<write-mode name="schedule_action">
<query params="action_id, name_id, evr_id, arch_id">
INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id, package_arch_id)
13 years, 5 months
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_management/rhncfg_add.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_diff.py | 6 +++---
client/tools/rhncfg/config_management/rhncfg_remove.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_upload_channel.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7e84ae9095f1309d113a3d2e58e349b9714ef2e7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 26 14:40:44 2010 +0100
656895 - fixing other instances of two-parameter utils.startswith.
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py b/client/tools/rhncfg/config_management/rhncfg_add.py
index c522c32..19ebc4d 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -81,7 +81,7 @@ class Handler(handler_base.HandlerBase):
self.options.topdir = utils.rm_trailing_slash(self.options.topdir)
for f in files:
- if not utils.startswith(f, self.options.topdir):
+ if not f.startswith(self.options.topdir):
die(8, "--topdir %s specified, but file `%s' doesn't comply"
% (self.options.topdir, f))
files_to_push.append((f, f[len(self.options.topdir):]))
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 1e95a2d..b1d7b42 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -83,7 +83,7 @@ class Handler(handler_base.HandlerBase):
topdir = utils.rm_trailing_slash(topdir)
for f in files:
- if not utils.startswith(f, topdir):
+ if not f.startswith(topdir):
die(8, "--topdir %s specified, but file `%s' doesn't comply"
% (topdir, f))
if os.path.isdir(f) and not os.path.islink(f):
@@ -132,11 +132,11 @@ class Handler(handler_base.HandlerBase):
first_row = pipe.readline()
if not first_row:
return ""
- elif utils.startswith(first_row, "---"):
+ elif first_row.startswith("---"):
first_row = "--- %s\tconfig_channel: %s\trevision: %s\n" % (
path, channel, info['revision']
)
- elif utils.startswith(first_row, "***"):
+ elif first_row.startswith("***"):
# This happens when we drop back to "diff -c"
first_row = "*** %s\tconfig_channel: %s\trevision: %s\n" % (
path, channel, info['revision']
diff --git a/client/tools/rhncfg/config_management/rhncfg_remove.py b/client/tools/rhncfg/config_management/rhncfg_remove.py
index ae17ed8..c04d027 100644
--- a/client/tools/rhncfg/config_management/rhncfg_remove.py
+++ b/client/tools/rhncfg/config_management/rhncfg_remove.py
@@ -55,7 +55,7 @@ class Handler(handler_base.HandlerBase):
die(8, "--topdir specified, but `%s' not a directory" %
self.options.topdir)
for f in files:
- if not utils.startswith(f, self.options.topdir):
+ if not f.startswith(self.options.topdir):
die(8, "--topdir %s specified, but file `%s' doesn't comply"
% (self.options.topdir, f))
files_to_remove.append((f, f[len(self.options.topdir):]))
diff --git a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
index 0944df8..8a153a7 100644
--- a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
@@ -96,7 +96,7 @@ class Handler(handler_base.HandlerBase):
flist = list_files_recursive(channel_dir)
for (dirname, filenames) in flist:
- assert utils.startswith(dirname, channel_dir)
+ assert dirname.startswith(channel_dir)
remote_dirname = dirname[len(channel_dir):]
for f in filenames:
13 years, 5 months
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_common/rhn_main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b997f9e780120fbeae92defbc427b7103ba5b141
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 26 14:34:27 2010 +0100
656895 - Need to call startswith on string.
Addressing
Traceback (most recent call last):
File "/usr/bin/rhncfg-client", line 34, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 67, in main
if utils.startswith(arg, server_name_opt):
AttributeError: 'module' object has no attribute 'startswith'
diff --git a/client/tools/rhncfg/config_common/rhn_main.py b/client/tools/rhncfg/config_common/rhn_main.py
index 0e021cd..dbb93c0 100644
--- a/client/tools/rhncfg/config_common/rhn_main.py
+++ b/client/tools/rhncfg/config_common/rhn_main.py
@@ -64,7 +64,7 @@ class BaseMain:
show_help = 1
continue
- if utils.startswith(arg, server_name_opt):
+ if arg.startswith(server_name_opt):
rarg = arg[len(server_name_opt):]
if not rarg:
needs_server_name = 1
13 years, 5 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3dc3e6d8986ec442d2a6ab651100840c34c9690e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 26 14:19:51 2010 +0100
Fix handling of eval (DBD::Oracle).
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 3f46b39..5084c11 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -542,7 +542,8 @@ sub execute_h {
if (ref $v and blessed($v) and $v->isa("RHN::DB::Type::BLOB")) {
if ($self->{Database}->{Driver}->{Name} eq 'Oracle') {
- eval 'use DBD::Oracle ()' or die $@;
+ eval 'use DBD::Oracle ()';
+ if ($@) { die $@; }
$attr->{ora_type} = DBD::Oracle::ORA_BLOB();
if (defined $v->{ora_field}) {
$attr->{ora_field} = $v->{ora_field};
13 years, 5 months
Changes to 'refs/tags/oracle-server-scripts-10.2.0.52-1'
by Michael Mraka
Tag 'oracle-server-scripts-10.2.0.52-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-11-26 12:16 +0000
Tagging package [oracle-server-scripts] version [10.2.0.52-1] in directory [projects/oracle-server-scripts/].
Changes since python-gzipstream-1.4.2-1:
Michael Mraka (3):
643368 - size oracle sga dynamicaly
added correct units to memory params
Automatic commit of package [oracle-server-scripts] release [10.2.0.52-1].
---
projects/oracle-server-scripts/create-db.sh | 1 +
projects/oracle-server-scripts/oracle-compute-sga.sh | 4 ++--
projects/oracle-server-scripts/oracle-server-scripts.spec | 8 ++++++--
rel-eng/packages/oracle-server-scripts | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
---
13 years, 5 months
projects/oracle-server-scripts rel-eng/packages
by Michael Mraka
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4c1e5a39a671d82651d4693bcb424e5ce96fba24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 26 13:16:45 2010 +0100
Automatic commit of package [oracle-server-scripts] release [10.2.0.52-1].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 453c8ad..154e99a 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -8,7 +8,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
-Version: 10.2.0.51
+Version: 10.2.0.52
Release: 1%{?dist}
Source0: oracle-home.sh
Source1: init-params.ora
@@ -100,6 +100,9 @@ exit 0
%{oracle_scripts}
%changelog
+* Fri Nov 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.52-1
+- 643368 - compute sga size dynamicaly
+
* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.51-1
- switched to default VersionTagger
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index 64e30f1..a6e9064 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0.51-1 projects/oracle-server-scripts/
+10.2.0.52-1 projects/oracle-server-scripts/
13 years, 5 months