projects/oracle-server-scripts
by Michael Mraka
projects/oracle-server-scripts/create-db.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c063bb09827c1c00e984f7f50709076318b20e8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 22 14:35:03 2011 +0100
new m4 (1.4.13-5) insists on having defines before template
diff --git a/projects/oracle-server-scripts/create-db.sh b/projects/oracle-server-scripts/create-db.sh
index 8e3f45f..ddebc5c 100755
--- a/projects/oracle-server-scripts/create-db.sh
+++ b/projects/oracle-server-scripts/create-db.sh
@@ -308,7 +308,7 @@ function CreateDatabase() {
db=$2
if [ -z "$db" ] ; then return ; fi
- m4 $template $(m4_macros $db) | $ORACLE_HOME/bin/sqlplus /nolog \
+ m4 $(m4_macros $db) $template | $ORACLE_HOME/bin/sqlplus /nolog \
|| exit $?
}
13 years, 1 month
web/spacewalk-web.spec
by Jan Pazdziora
web/spacewalk-web.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c2045578838ed8124fa2211298ef765b1aa0a92f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:52:52 2011 +0100
Moving the Requires: httpd from sniglets to base-minimal, dobby, and pxt which actually have %files with apache group in them.
Addressing
^M Installing : spacewalk-base-minimal-1.4.12-1.el6.noarch 191/333
warning: group apache does not exist - using root
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ccf3ee5..e0308e4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -55,6 +55,7 @@ Requires: tomcat5
%else
Requires: tomcat6
%endif
+Requires: httpd
Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0
@@ -65,6 +66,7 @@ Independent Perl modules in the RHN:: name-space.
Summary: Perl modules and scripts to administer an Oracle database
Group: Applications/Internet
Requires: spacewalk-base
+Requires: httpd
Obsoletes: rhn-dobby < 5.3.0
Provides: rhn-dobby = 5.3.0
@@ -88,6 +90,7 @@ A component framework for Spacewalk.
Summary: The PXT library for web page templating
Group: Applications/Internet
Requires: spacewalk(spacewalk-base-minimal)
+Requires: httpd
Obsoletes: rhn-pxt < 5.3.0
Provides: rhn-pxt = 5.3.0
@@ -100,7 +103,6 @@ equlivalent to things like Apache::ASP and Mason
%package -n spacewalk-sniglets
Group: Applications/Internet
Summary: PXT Tag handlers
-Requires: httpd
Obsoletes: rhn-sniglets < 5.3.0
Provides: rhn-sniglets = 5.3.0
13 years, 1 month
web/spacewalk-web.spec
by Jan Pazdziora
web/spacewalk-web.spec | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 627bf7798afcd0a9ff531dc7b9a9292111bdc55a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:50:46 2011 +0100
No need to require mod_perl explicitly in spacewalk-sniglets, we will get it via perl(Apache2::Cookie) and perl-libapreq2 from spacewalk-pxt.
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b8d0392..ccf3ee5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -100,7 +100,6 @@ equlivalent to things like Apache::ASP and Mason
%package -n spacewalk-sniglets
Group: Applications/Internet
Summary: PXT Tag handlers
-Requires: mod_perl >= 2.0.0
Requires: httpd
Obsoletes: rhn-sniglets < 5.3.0
Provides: rhn-sniglets = 5.3.0
13 years, 1 month
web/spacewalk-web.spec
by Jan Pazdziora
web/spacewalk-web.spec | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 85fa4dd004079c7e9ade93ca265329b6f0096d35
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:44:29 2011 +0100
Removing RHEL 4 specific Requires as we no longer support Spacewalk on RHEL 4.
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 95a9d56..b8d0392 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -101,11 +101,7 @@ equlivalent to things like Apache::ASP and Mason
Group: Applications/Internet
Summary: PXT Tag handlers
Requires: mod_perl >= 2.0.0
-%if 0%{?rhel} == 4
-Requires: mod_jk-ap20
-%else
Requires: httpd
-%endif
Obsoletes: rhn-sniglets < 5.3.0
Provides: rhn-sniglets = 5.3.0
13 years, 1 month
2 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8a5064c455a99ef3d105a984d193a4942dcee38a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:32:00 2011 +0100
Fixing another taggable_systems_in_set PostgreSQL issue.
Addressing
DBD::Pg::st execute failed: ERROR: function nvl(name, unknown) does not exist
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index a56da8b..911ac83 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -132,7 +132,7 @@ SELECT DISTINCT S.id,
AND USP.server_id = SS.server_id
AND USP.server_id = S.id
) S
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ORDER BY UPPER(coalesce(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
</mode>
commit 6e05757d69ea63b07ca775b824589176f1fce2c4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:29:21 2011 +0100
Fixing the taggable_systems_in_set PostgreSQL issue.
Addressing
DBD::Pg::st execute failed: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list at character 454
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index f5be131..a56da8b 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -116,6 +116,8 @@ ORDER BY CDK.label
<mode name="taggable_systems_in_set">
<query params="user_id">
+select *
+from (
SELECT DISTINCT S.id,
S.name AS SERVER_NAME
FROM rhnServer S,
@@ -129,6 +131,7 @@ SELECT DISTINCT S.id,
AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = ST.element AND SFV.label = 'ftr_snapshotting')
AND USP.server_id = SS.server_id
AND USP.server_id = S.id
+) S
ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
13 years, 1 month
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit df09856f76dab0072fc692ecd6cc20a0b86c913f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:26:18 2011 +0100
Fixing custom_info_keys PostgreSQL issue.
Addressing
DBD::Pg::st execute failed: ERROR: syntax error at or near ")"
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
index 3fd7d79..0249296 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
@@ -7,10 +7,9 @@ SELECT CDK.id,
CDK.description,
(
SELECT COUNT(SCDV.server_id)
- FROM rhnServerCustomDataValue SCDV,
- rhnUserServerPerms USP
+ FROM rhnUserServerPerms USP left outer join rhnServerCustomDataValue SCDV
+ on USP.server_id = SCDV.server_id
WHERE USP.user_id = :user_id
- AND USP.server_id = SCDV.server_id (+)
AND SCDV.key_id = CDK.id
) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
@@ -42,4 +41,4 @@ ORDER BY UPPER(CDK.label)
</query>
</mode>
-</datasource_modes>
\ No newline at end of file
+</datasource_modes>
13 years, 1 month
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2cd413f35eff217fce8c266ea0cb10c48a43fef9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 22 14:20:58 2011 +0100
Fixing the system_set_supports_reboot PostgreSQL issue.
Addressing
DBD::Pg::st execute failed: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index bc972c0..f5be131 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -733,6 +733,8 @@ SELECT DISTINCT SP.server_id id, PN.name || '-' || PE.evr.as_vre_simple() NVRE
<query name="system_set_supports_reboot" />
</mode>
<query name="system_set_supports_reboot" params="user_id, set_label">
+SELECT *
+from (
SELECT DISTINCT S.id, S.name
FROM rhnArchType AT,
rhnServerArch SA,
@@ -757,6 +759,7 @@ SELECT DISTINCT S.id, S.name
AND PE2.id = lookup_evr(NULL, '2.9.3', '2.2.1AS')
AND PE.evr >= PE2.evr))
)
+) S
ORDER BY UPPER(S.name), S.id
</query>
13 years, 1 month
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/satsync.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8d77bc5d25d798173e9ea7092fd1a70d30b720df
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Mar 11 17:37:06 2011 +0100
set envelope From to traceback email
This is relict from BZ 132067
addressing:
Standard-error: ERROR: upon attempt to write to log file: 'ascii' codec can't encode character u'\u017e' in position 65: ordinal not in range(128)ERROR: upon attempt to write to log file: 'ascii' codec can't encode character u'\u017e' in position 119: ordinal not in range(128)Traceback (most recent call last):
File "/usr/bin/satellite-sync", line 175, in ?
systemExit_exception(7, "SYNC ERROR: attempting to display as much information as possible:", e)
File "/usr/bin/satellite-sync", line 125, in systemExit_exception
satsync.sendMail(forceEmail=1)
File "/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/satsync.py", line 362, in sendMail
rhnMail.send(headers, body, sender=sndr)
File "/usr/lib/python2.4/site-packages/spacewalk/common/rhnMail.py", line 57, in send
server.sendmail(sender, toaddrs, "%s\n%s\n" % (joined_headers, body))
File "/usr/lib64/python2.4/smtplib.py", line 680, in sendmail
raise SMTPSenderRefused(code, resp, from_addr)
smtplib.SMTPSenderRefused: (553, '5.5.4 <rhn-satellite>... Domain name required for sender address rhn-satellite', 'rhn-satellite')
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1506242..073736b 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -357,8 +357,7 @@ def sendMail(forceEmail=0):
headers = {
'Subject' : _('RHN Management Satellite sync. report from %s') % os.uname()[1],
}
- #sndr = CFG.get('traceback_mail', 'rhn-satellite')
- sndr = 'rhn-satellite'
+ sndr = CFG.get('traceback_mail', 'root@localhost')
rhnMail.send(headers, body, sender=sndr)
else:
print _("+++ email requested, but there is nothing to send +++")
13 years, 1 month
Changes to 'refs/tags/perl-NOCpulse-OracleDB-1.28.20-1'
by Michael Mraka
Tag 'perl-NOCpulse-OracleDB-1.28.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-22 12:01 +0000
Tagging package [perl-NOCpulse-OracleDB] version [1.28.20-1] in directory [monitoring/PerlModules/NP/OracleDB/].
Changes since spacewalk-reports-1.4.5-1:
Michael Mraka (2):
fixed segmentation fault in use NOCpulse::DBRecord
Automatic commit of package [perl-NOCpulse-OracleDB] release [1.28.20-1].
---
monitoring/PerlModules/NP/OracleDB/DBRecord.pm | 2 +-
monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-OracleDB | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years, 1 month
2 commits - monitoring/PerlModules rel-eng/packages
by Michael Mraka
monitoring/PerlModules/NP/OracleDB/DBRecord.pm | 2 +-
monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec | 5 ++++-
rel-eng/packages/perl-NOCpulse-OracleDB | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d2e679a1ca63e974486de7d4fcec34775ded0e38
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 22 13:01:28 2011 +0100
Automatic commit of package [perl-NOCpulse-OracleDB] release [1.28.20-1].
diff --git a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec
index eda747e..3584b01 100644
--- a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec
+++ b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec
@@ -1,5 +1,5 @@
Name: perl-NOCpulse-OracleDB
-Version: 1.28.19
+Version: 1.28.20
Release: 1%{?dist}
Summary: Perl modules for NOCpulse Oracle database access
URL: https://fedorahosted.org/spacewalk
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/NOCpulse/*
%changelog
+* Tue Mar 22 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.28.20-1
+- fixed segmentation fault in use NOCpulse::DBRecord
+
* Tue Mar 22 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.28.19-1
- add missing buildrequires
diff --git a/rel-eng/packages/perl-NOCpulse-OracleDB b/rel-eng/packages/perl-NOCpulse-OracleDB
index 4da40bd..c223850 100644
--- a/rel-eng/packages/perl-NOCpulse-OracleDB
+++ b/rel-eng/packages/perl-NOCpulse-OracleDB
@@ -1 +1 @@
-1.28.19-1 monitoring/PerlModules/NP/OracleDB/
+1.28.20-1 monitoring/PerlModules/NP/OracleDB/
commit aefd392ca40dd5aff77e0267b22b982c10f1e27b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 22 12:55:45 2011 +0100
fixed segmentation fault in use NOCpulse::DBRecord
diff --git a/monitoring/PerlModules/NP/OracleDB/DBRecord.pm b/monitoring/PerlModules/NP/OracleDB/DBRecord.pm
index 0912c99..9032575 100644
--- a/monitoring/PerlModules/NP/OracleDB/DBRecord.pm
+++ b/monitoring/PerlModules/NP/OracleDB/DBRecord.pm
@@ -91,7 +91,7 @@ sub DatabaseConnection
if (NOCpulse::DBRecord->getClassInstVar('DatabaseConnection')) {
return NOCpulse::DBRecord->getClassInstVar('DatabaseConnection');
} else {
- use RHN:DB;
+ use RHN::DB;
if (my $dbMain = RHN::DB->connect) {
NOCpulse::DBRecord->setClassVar('DatabaseConnection', $dbMain);
return $dbMain;
13 years, 1 month