monitoring/NPalert rel-eng/packages
by Jan Pazdziora
monitoring/NPalert/NPalert.spec | 6 +++++-
rel-eng/packages/NPalert | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ceb6d58516324cfb93d6958217afc815d18732bd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 27 15:11:55 2011 +0200
Automatic commit of package [NPalert] release [1.126.22-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 059a6a0..b4192a7 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.21
+Version: 1.126.22
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -138,6 +138,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 27 2011 Jan Pazdziora 1.126.22-1
+- Neither functions from File::Basename nor from File::Copy seem to be used by
+ ack-processor, removing the uses.
+
* Fri Mar 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.126.21-1
- reuse RHN:DB for db connection in AlertDB.pm (PG)
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index 652e513..b95d637 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.21-1 monitoring/NPalert/
+1.126.22-1 monitoring/NPalert/
13 years
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit fe350b446aec70d1003ffa1677fb6e1912fd0b15
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Apr 27 14:26:35 2011 +0200
680176 - display unlimited subscriptions if applicable
That is in cases where the host has virtualization / virtualization
host entitlement assigned.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 6b6b37c..247004d 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2028,6 +2028,11 @@ public class SystemManager extends BaseManager {
Long availableSubscriptions = null;
+ /* Check if the channel is consumable for free */
+ if (ChannelManager.isChannelFreeForSubscription(serverIn, channelIn)) {
+ return availableSubscriptions;
+ }
+
/* If serverIn is fve eligible, check number of flex guest entitlements available */
if (m.execute(params).size() >= 1) {
availableSubscriptions =
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/server/Server.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 994ec87d3caec3ff6fabb1e8c69c454edd5a90ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 27 10:48:09 2011 +0200
699753 - use the primary IP address from the rhnServerNetwork table
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index c923115..b1157d5 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -808,18 +808,16 @@ public class Server extends BaseDomainHelper implements Identifiable {
* @return Returns the primary ip for this server
*/
public String getIpAddress() {
- // First search networkInterfaces because they are
- // better defined (name and ip address)
- NetworkInterface ni = findPrimaryNetworkInterface();
- if (ni != null) {
- log.debug("Found a NetworkInterface: " + ni.getIpaddr());
- return ni.getIpaddr();
- }
Network n = findPrimaryNetwork();
if (n != null) {
log.debug("Found a Network: " + n.getIpaddr());
return n.getIpaddr();
}
+ NetworkInterface ni = findPrimaryNetworkInterface();
+ if (ni != null) {
+ log.debug("Found a NetworkInterface: " + ni.getIpaddr());
+ return ni.getIpaddr();
+ }
return null;
}
13 years
Changes to 'refs/tags/spacewalk-setup-1.5.3-1'
by Šimon Lukašík
Tag 'spacewalk-setup-1.5.3-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-04-27 10:48 +0000
Tagging package [spacewalk-setup] version [1.5.3-1] in directory [spacewalk/setup/].
Changes since spacewalk-java-1.5.9-1:
Jan Pazdziora (4):
Neither functions from File::Basename nor from File::Copy seem to be used by ack-processor, removing the uses.
When creating config files in /etc/rhn, clear access for other (make it -rw-r-----, in typical case).
Do not deploy .orig files.
Do not confuse me by saying Unsubstituted Tags when there are none.
Miroslav Suchý (2):
push to fedora packages which already pass package review
remove duplicity
Simon Lukasik (2):
Drop the schema only if exists
Automatic commit of package [spacewalk-setup] release [1.5.3-1].
---
monitoring/NPalert/scripts/ack-processor | 2 -
projects/perl-Satcon/bin/satcon-deploy-tree.pl | 13 +++++-------
rel-eng/packages/spacewalk-setup | 2 -
rel-eng/push-packages-to-fedora.sh | 2 -
spacewalk/setup/lib/Spacewalk/Setup.pm | 26 ++++++++++++-------------
spacewalk/setup/spacewalk-setup.spec | 5 +++-
6 files changed, 25 insertions(+), 25 deletions(-)
---
13 years
rel-eng/packages spacewalk/setup
by Šimon Lukašík
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e0afde6a3983bdd956c8de76ebd2f355e0d74651
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 27 12:48:00 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 8b10c1c..d3e9a2b 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.2-1 spacewalk/setup/
+1.5.3-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index e020703..a6f29c4 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Wed Apr 27 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.3-1
+- Drop the schema only if exists (slukasik(a)redhat.com)
+
* Fri Apr 15 2011 Jan Pazdziora 1.5.2-1
- redirect upgrade log to correct file (mzazrivec(a)redhat.com)
- move the m4 template at the end of cmd line parameters (mzazrivec(a)redhat.com)
13 years
spacewalk/setup
by Šimon Lukašík
spacewalk/setup/lib/Spacewalk/Setup.pm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 59748dc6a90de2390b136afb752ce6c6b1f1d74f
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Apr 27 12:45:18 2011 +0200
Drop the schema only if exists
Addressing:
DBD::Pg::db do failed: ERROR: schema rpm does not exist
DBD::Pg::db do failed: ERROR: schema rhn_exception does not exist
DBD::Pg::db do failed: ERROR: schema rhn_quota does not exist
DBD::Pg::db do failed: ERROR: schema rhn_config does not exist
DBD::Pg::db do failed: ERROR: schema rhn_server does not exist
DBD::Pg::db do failed: ERROR: schema rhn_entitlements does not exist
DBD::Pg::db do failed: ERROR: schema rhn_bel does not exist
DBD::Pg::db do failed: ERROR: schema rhn_cache does not exist
DBD::Pg::db do failed: ERROR: schema rhn_channel does not exist
DBD::Pg::db do failed: ERROR: schema rhn_config_channel does not exist
DBD::Pg::db do failed: ERROR: schema rhn_org does not exist
DBD::Pg::db do failed: ERROR: schema rhn_user does not exist
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 45e1c6b..b6c1ef7 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -991,19 +991,19 @@ sub postgresql_test_db_schema {
# Spacewalk might have created.
my $POSTGRESQL_CLEAR_SCHEMA = <<EOS;
- drop schema rpm cascade ;
- drop schema rhn_exception cascade ;
- drop schema rhn_quota cascade ;
- drop schema rhn_config cascade ;
- drop schema rhn_server cascade ;
- drop schema rhn_entitlements cascade ;
- drop schema rhn_bel cascade ;
- drop schema rhn_cache cascade ;
- drop schema rhn_channel cascade ;
- drop schema rhn_config_channel cascade ;
- drop schema rhn_org cascade ;
- drop schema rhn_user cascade ;
- drop schema public cascade ;
+ drop schema if exists rpm cascade ;
+ drop schema if exists rhn_exception cascade ;
+ drop schema if exists rhn_quota cascade ;
+ drop schema if exists rhn_config cascade ;
+ drop schema if exists rhn_server cascade ;
+ drop schema if exists rhn_entitlements cascade ;
+ drop schema if exists rhn_bel cascade ;
+ drop schema if exists rhn_cache cascade ;
+ drop schema if exists rhn_channel cascade ;
+ drop schema if exists rhn_config_channel cascade ;
+ drop schema if exists rhn_org cascade ;
+ drop schema if exists rhn_user cascade ;
+ drop schema if exists public cascade ;
create schema public authorization postgres ;
EOS
sub postgresql_clear_db {
13 years
2 commits - projects/perl-Satcon
by Jan Pazdziora
projects/perl-Satcon/bin/satcon-deploy-tree.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 20cf965ed78ee1bd7317ed98714acfb8be79edc3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 27 12:20:35 2011 +0200
Do not confuse me by saying Unsubstituted Tags when there are none.
diff --git a/projects/perl-Satcon/bin/satcon-deploy-tree.pl b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
index 60bb9da..c55a6de 100755
--- a/projects/perl-Satcon/bin/satcon-deploy-tree.pl
+++ b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
@@ -103,7 +103,7 @@ sub process_file {
}
}
-warn "Unsubstituted Tags:\n";
+warn "Unsubstituted Tags:\n" if $engine->unsubstituted_tags;
foreach my $kw (sort $engine->unsubstituted_tags) {
warn " $kw\n";
}
commit dc56d2472e419a42d5187aeb1802141e3ac9dd50
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 27 12:19:31 2011 +0200
Do not deploy .orig files.
diff --git a/projects/perl-Satcon/bin/satcon-deploy-tree.pl b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
index 70fa95a..60bb9da 100755
--- a/projects/perl-Satcon/bin/satcon-deploy-tree.pl
+++ b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
@@ -58,7 +58,7 @@ sub process_file {
my ($engine, $sourcedir, $destdir) = @_;
my $full_path = $File::Find::name;
- if ($full_path =~ m(/CVS$)) {
+ if ($full_path =~ m(/CVS$|\.orig$)) {
$File::Find::prune = 1;
return;
}
13 years
projects/perl-Satcon
by Jan Pazdziora
projects/perl-Satcon/bin/satcon-deploy-tree.pl | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit d7c93973d1e40b3f0572ab3057ac10b176237e09
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Apr 27 11:59:46 2011 +0200
When creating config files in /etc/rhn, clear access for other (make it -rw-r-----, in typical case).
diff --git a/projects/perl-Satcon/bin/satcon-deploy-tree.pl b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
index 8e2207f..70fa95a 100755
--- a/projects/perl-Satcon/bin/satcon-deploy-tree.pl
+++ b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
@@ -87,6 +87,10 @@ sub process_file {
open OF, ">$destdir/$relative_path"
or die "Cannot open $destdir/$relative_path: $!";
+ # save permissions also but clear access for other
+ my $mode = (stat("$sourcedir/$relative_path"))[2] & 07770;
+ chmod $mode, "$destdir/$relative_path";
+
system '/sbin/restorecon', '-vv', "$destdir/$relative_path";
while (<IF>) {
@@ -97,11 +101,6 @@ sub process_file {
close IF;
close OF;
}
-
- # save permissions also
- my $mode = (stat("$sourcedir/$relative_path"))[2] & 07777;
- chmod $mode, "$destdir/$relative_path";
-
}
warn "Unsubstituted Tags:\n";
13 years
2 commits - rel-eng/push-packages-to-fedora.sh
by Miroslav Suchý
rel-eng/push-packages-to-fedora.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a48f3eafd2995eac7acdd67029f518f181072b4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Apr 26 16:16:32 2011 +0200
remove duplicity
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh
index be61f5a..2f83f04 100755
--- a/rel-eng/push-packages-to-fedora.sh
+++ b/rel-eng/push-packages-to-fedora.sh
@@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1
# top dir of spacewalk git checkout
TOP_DIR_GIT=$2
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream"
+PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream"
if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then
commit dd35ece2ead001d9b16f65037b9b595dcfa10c26
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Apr 26 14:20:13 2011 +0200
push to fedora packages which already pass package review
(cherry picked from commit 85543e2341f463f691d9d0a71e57ef7e7419ede6)
diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh
index 779fab5..be61f5a 100755
--- a/rel-eng/push-packages-to-fedora.sh
+++ b/rel-eng/push-packages-to-fedora.sh
@@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1
# top dir of spacewalk git checkout
TOP_DIR_GIT=$2
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config"
+PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream"
if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then
13 years
monitoring/NPalert
by Jan Pazdziora
monitoring/NPalert/scripts/ack-processor | 2 --
1 file changed, 2 deletions(-)
New commits:
commit acab59eaf99ad8d7e78f689f8f9675f69916b2f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Apr 26 11:07:40 2011 +0200
Neither functions from File::Basename nor from File::Copy seem to be used by ack-processor, removing the uses.
diff --git a/monitoring/NPalert/scripts/ack-processor b/monitoring/NPalert/scripts/ack-processor
index 21855c1..903dc85 100755
--- a/monitoring/NPalert/scripts/ack-processor
+++ b/monitoring/NPalert/scripts/ack-processor
@@ -1,8 +1,6 @@
#!/usr/bin/perl
use strict;
-use File::Basename;
-use File::Copy;
use FileHandle;
use Getopt::Long;
use GDBM_File;
13 years