rel-eng/packages/spacewalk-utils | 2 +-
utils/delete-old-systems-interactive | 8 ++++----
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 26ee9ab7de6120c1a47d56f441b7a509b7dcde7e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 6 11:28:55 2012 +0200
Automatic commit of package [spacewalk-utils] release [1.8.22-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index ee505c7..c1d892e 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.21-1 utils/
+1.8.22-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 479160a..1b3f9c6 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.21
+Version: 1.8.22
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Mon Aug 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.22-1
+- 817484 - strip non-number chars from date format
+
* Fri Jul 06 2012 Stephen Herr <sherr(a)redhat.com> 1.8.21-1
- 838131 - spacewalk-clone-by-date can clone only security errata
commit 8018f8d70ccb0070678f0c968ca3b4b5d5663e7e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 6 11:24:34 2012 +0200
817484 - strip non-number chars from date format
because we compare dates as numbers
diff --git a/utils/delete-old-systems-interactive b/utils/delete-old-systems-interactive
index f242ee2..a987de8 100755
--- a/utils/delete-old-systems-interactive
+++ b/utils/delete-old-systems-interactive
@@ -68,13 +68,13 @@ $systems = [
my $delete = 0;
my $total = @$systems;
-$cutoff =~ s/-//g;
-$cutoff =~ tr/T/ /;
+$cutoff =~ s/\D//g;
for (my $i = 0; $i < @$systems; $i++) {
my $sys = $systems->[$i];
my $sys_date = $sys->{last_checkin};
- if (not $sys_date =~ / /) {
- $sys_date .= ' 23:59:59';
+ my $sys_date =~ s/\D//g;
+ if (length($sys_date) == 8) {
+ $sys_date .= '235959';
}
print "System [$sys->{name}] id [$sys->{id}] last checking
[$sys->{last_checkin}] ";
if ($sys_date lt $cutoff) {
Show replies by thread