backend/spacewalk-backend.spec | 24 +++++++++--
monitoring/PerlModules/NP/Probe/DataSource/LogAgentOutput.pm | 2
rel-eng/packages/spacewalk-backend | 2
satellite/install/install.pl | 2
web/modules/dobby/scripts/check-oracle-space-usage.sh | 2
5 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit 342eac0be08fb95b1d34673b035bbb2e33283d7c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 1 09:57:44 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.2.48-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bbca97e..fc82408 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,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.2.47
+Version: 1.2.48
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -669,6 +669,24 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Nov 01 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.48-1
+- 612581 - take ownership of /usr/lib/python2.7/site-packages/spacewalk/wsgi
+ (msuchy(a)redhat.com)
+- 612581 - change egrep to grep -E (msuchy(a)redhat.com)
+- even getPackageChecksum() and getPackageChecksumBySession() can be merged
+ into a single function (michael.mraka(a)redhat.com)
+- fixed typo and syntax error (michael.mraka(a)redhat.com)
+- merged getSourcePackageChecksum() into getPackageChecksum()
+ (michael.mraka(a)redhat.com)
+- merged getSourcePackageChecksumBySession() to getPackageChecksumBySession()
+ (michael.mraka(a)redhat.com)
+- merged duplicated code into _get_package_checksum()
+ (michael.mraka(a)redhat.com)
+- reordered commands to put checksum stuff together (michael.mraka(a)redhat.com)
+- merged 2 calls with just different arguments (michael.mraka(a)redhat.com)
+- moved X-RHN-Action stuff into one place (michael.mraka(a)redhat.com)
+- moved duplicated code to a function (michael.mraka(a)redhat.com)
+
* Fri Oct 29 2010 Jan Pazdziora 1.2.47-1
- For Function in PostgreSQL, we have to not just execute, but also fetch the
value to return.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ecee188..8784cdb 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.47-1 backend/
+1.2.48-1 backend/
commit 6c084c74475113a3a8c30f6289a9aa96990967d9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 1 09:49:02 2010 +0100
612581 - take ownership of /usr/lib/python2.7/site-packages/spacewalk/wsgi
addressing:
Main package contains empty directory
/usr/lib/python2.7/site-packages/spacewalk/wsgi and then populated
/usr/share/rhn/wsgi/. I assume this is a mistake?
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5d7ec52..bbca97e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -353,7 +353,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{_mandir}/man8/spacewalk-cfg-get.8.gz
# wsgi stuff
%if !( 0%{?rhel} && 0%{?rhel} < 6)
-%dir %{pythonrhnroot}/wsgi
+%dir %{rhnroot}/wsgi
%{rhnroot}/wsgi/__init__.py*
%{rhnroot}/wsgi/wsgiHandler.py*
%{rhnroot}/wsgi/wsgiRequest.py*
commit 5f34d0c0352a775331e169f1fd116a0ede1c64b6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 1 09:35:15 2010 +0100
612581 - change egrep to grep -E
addressing:
deprecated-grep: please use standard grep with proper switches
It was originally reported to backend/spacewalk-backend.spec, but
I took the liberty and change this in all other places of our code.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2111679..5d7ec52 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -305,7 +305,7 @@ fi
# Is secret key in our config file?
regex="^[[:space:]]*(server\.|)secret_key[[:space:]]*=.*$"
-if egrep -i $regex %{rhnconf}/rhn.conf > /dev/null 2>&1 ; then
+if grep -E -i $regex %{rhnconf}/rhn.conf > /dev/null 2>&1 ; then
# secret key already there
rm -f %{rhnconf}/rhnSecret.py*
exit 0
diff --git a/monitoring/PerlModules/NP/Probe/DataSource/LogAgentOutput.pm
b/monitoring/PerlModules/NP/Probe/DataSource/LogAgentOutput.pm
index 9887b4c..09f7940 100644
--- a/monitoring/PerlModules/NP/Probe/DataSource/LogAgentOutput.pm
+++ b/monitoring/PerlModules/NP/Probe/DataSource/LogAgentOutput.pm
@@ -58,7 +58,7 @@ sub init {
}
if ((!$self->error_msg) && ($regex)) {
#regex param is set, so find total number of occurences in the log
- my $grep = 'egrep -c';
+ my $grep = 'grep -E -c';
$Log->log_method(2, "Grepping log for ", $regex, " \n" );
$unix_command->execute("$grep \'$regex\' $log_file");
if ($unix_command->errors) {
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index c948229..314f931 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -288,7 +288,7 @@ sub python_path {
}
sub remove_php_packages {
- my @packages = `rpm -qa | egrep '(php|piranha|squirrelmail|specspo)'`;
+ my @packages = `rpm -qa | grep -E '(php|piranha|squirrelmail|specspo)'`;
if (@packages) {
for (@packages) {
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh
b/web/modules/dobby/scripts/check-oracle-space-usage.sh
index 38cf37d..6ea4b48 100755
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ b/web/modules/dobby/scripts/check-oracle-space-usage.sh
@@ -16,7 +16,7 @@ export PATH
reportusage() {
# don't report UNDO usage
- /sbin/runuser oracle -c "db-control report" | egrep -v 'UNDO|TEMP'
+ /sbin/runuser oracle -c "db-control report" | grep -E -v
'UNDO|TEMP'
}
mailitout() {