java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 182ece7527a9c961a0339ae39102ba830987ca7d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 9 15:19:10 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.7-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9a5c381..e3dedb1 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.6
+Version: 1.9.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 09 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.7-1
+- reverted macro name translation
+
* Fri Nov 09 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.6-1
- backported translation changes from zanata
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b6b6cd2..c12830f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.6-1 java/
+1.9.7-1 java/
11 years, 6 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1fcb70e77fcb56bc9ab8d5915a3dc9c798028fd8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 9 15:17:46 2012 +0100
reverted macro name translation
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index 909bd61..cb47516 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -4457,7 +4457,7 @@ de este usuario antes de intentar desactivar esta cuenta.</target>
<context context-type="sourcefile">/rhn/systems/details/packages/profiles/</context>
<context context-type="paramnotes">sid, actionid, servername, profilename</context>
</context-group>
- <target><strong>NOTA:</strong>@@NOMBRE_PRODUCTO@@ ha <strong><a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">programado</a></strong> refrescar el hardware para <strong>{2}</strong> que se ejecute antes de la sincronización del perfil de paquetes. Esta acción se requiere para verificar si el sistema tiene la capacidad de comparar paquetes.</target>
+ <target><strong>NOTA:</strong>@@PRODUCT_NAME@@ ha <strong><a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">programado</a></strong> refrescar el hardware para <strong>{2}</strong> que se ejecute antes de la sincronización del perfil de paquetes. Esta acción se requiere para verificar si el sistema tiene la capacidad de comparar paquetes.</target>
</trans-unit>
<trans-unit id="filterCreate.success">
<source>The filter {0} was successfully created</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 0db46d7..dabf9a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5903,7 +5903,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
</trans-unit>
<trans-unit id="ssm.overview.summary">
<source>Welcome to the System Set Manager. This interface will allow you to easily work with large numbers of systems in the @@PRODUCT_NAME@@.</source>
- <target>Bienvenido al Gestor de configuración del sistema. Esta interfaz le permitirá fácilmente trabajar con grandes cantidades de sistemas en el @@NOMBRE_PRODUCTO@@.</target>
+ <target>Bienvenido al Gestor de configuración del sistema. Esta interfaz le permitirá fácilmente trabajar con grandes cantidades de sistemas en el @@PRODUCT_NAME@@.</target>
</trans-unit>
<trans-unit id="ssm.overview.summary2">
<source>The following tabs aid you in a number of tasks:</source>
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.6-1'
by Michael Mraka
Tag 'spacewalk-java-1.9.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-11-09 12:42 +0000
Tagging package [spacewalk-java] version [1.9.6-1] in directory [java/].
Changes since cobbler20-2.0.11-5:
Michael Mraka (7):
fixed line 13467 - Attribute 'name' must appear on element 'context-group'
fixed line 7321 - 'p aramnotes' is not a valid value
fixed line 2 - Attribute 'original' must appear on element 'file'
reformated using xmllint -format
backported translation changes from zanata
triple f is rarely needed in english
Automatic commit of package [spacewalk-java] release [1.9.6-1].
---
branding/java/code/src/com/redhat/rhn/branding/strings/StringResource_en_US.xml | 9
java/code/src/com/redhat/rhn/common/security/acl/StringResource_en_US.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 3961 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 2274
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 3961 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 3961 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 3961 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 3961 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4078 -
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 7509 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8622 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4167 -
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8538 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8533 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 7418 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 7418 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8543 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8533 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8558 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 7420 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8529 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8553 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 7418 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8532 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 8559 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml |29457 ++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml |34680 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |25749 +++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml |34682 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml |34686 +++++-----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml |29461 ++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml |29461 ++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml |34509 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml |34662 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml |34580 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml |29459 ++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml |34675 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml |34621 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml |29459 ++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml |34677 +++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml |34657 +++++----
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_bn_IN.xml | 1279
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 942
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml | 1417
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_gu.xml | 1279
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_hi.xml | 1279
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pa.xml | 1279
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml | 1417
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ta.xml | 1279
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml | 1419
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml | 187
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml | 614
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 148
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml | 627
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml | 610
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml | 187
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml | 187
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml | 643
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml | 620
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml | 669
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml | 187
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml | 615
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml | 674
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml | 187
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml | 625
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml | 647
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
84 files changed, 413005 insertions(+), 325152 deletions(-)
---
11 years, 6 months
7 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/ChannelEditor.pm | 2
web/modules/rhn/RHN/DB/SystemSnapshot.pm | 4 -
web/modules/rhn/RHN/DB/TinyURL.pm | 2
web/modules/rhn/RHN/Date.pm | 60 +++++++-----------
web/modules/sniglets/Sniglets/Errata.pm | 1
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 6 +
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 4 -
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 4 -
web/modules/sniglets/Sniglets/ServerActions.pm | 12 +--
web/modules/sniglets/Sniglets/Servers.pm | 2
10 files changed, 43 insertions(+), 54 deletions(-)
New commits:
commit 108d293dd49cd20a8cc18fc47cde762ca258f6e9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 14:25:32 2012 +0100
490524 - Return the datetime in the local time zone.
diff --git a/web/modules/rhn/RHN/Date.pm b/web/modules/rhn/RHN/Date.pm
index 3dbe02a..5c3b9dd 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.pm
@@ -95,6 +95,14 @@ sub now_long_date {
return POSIX::strftime($LONG_DATE_FORMAT, localtime);
}
+# Return the datetime in the local time zone. We do not need
+# to know what the time zone is, localtime takes care of that.
+sub local_long_date {
+ my $self = shift;
+ my $epoch = $self->epoch;
+ return POSIX::strftime($LONG_DATE_FORMAT, localtime($epoch));
+}
+
# construct a date from constituent elements
sub construct {
my $class = shift;
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index 46462ea..c4c643e 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -326,15 +326,12 @@ sub parse_date_pickbox {
second => 0,
time_zone => $pxt->user->get_timezone);
- if (not $long_date) {
+ if ($long_date) {
+ return $scheduled_time->local_long_date;
+ }
+ else {
return $scheduled_time->epoch;
}
-
- # the time was from the user's time. now we must make it local to
- # the app server in order to be passed to the database.
- $scheduled_time->time_zone("local");
-
- return $scheduled_time->long_date;
}
sub server_set_errata_set_actions_cb {
commit 75fe42d376b34c0a0cef0e7371b510346ec721a6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 14:12:22 2012 +0100
490524 - Epoch is always in UTC, no time_zone setting for epoch case.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index 1c3a2fa..46462ea 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -326,16 +326,15 @@ sub parse_date_pickbox {
second => 0,
time_zone => $pxt->user->get_timezone);
+ if (not $long_date) {
+ return $scheduled_time->epoch;
+ }
+
# the time was from the user's time. now we must make it local to
# the app server in order to be passed to the database.
$scheduled_time->time_zone("local");
- if ($long_date) {
- return $scheduled_time->long_date;
- }
- else {
- return $scheduled_time->epoch;
- }
+ return $scheduled_time->long_date;
}
sub server_set_errata_set_actions_cb {
commit f9690d7b0178c9ffc356ce268013f8c86f1776e3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 13:11:58 2012 +0100
Function date_to_epoch made obsolete, not used anymore.
diff --git a/web/modules/rhn/RHN/Date.pm b/web/modules/rhn/RHN/Date.pm
index 21bca8b..3dbe02a 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.pm
@@ -115,25 +115,6 @@ sub time_zone {
return $self->{dt}->time_zone;
}
-# internal function for conversion; a bit ineffecient right now but
-# gets the job done
-sub date_to_epoch {
- my $str = shift;
- my $zone_name = shift;
-
- my ($s, $m, $h, $day, $mon, $yr) = strptime($str);
-
- my $date = new DateTime(year => $yr + 1900,
- month => $mon + 1,
- day => $day,
- hour => $h,
- minute => $m,
- second => $s,
- time_zone => $zone_name);
-
- return $date->epoch;
-}
-
# format a string to a given pattern
sub strftime {
my $self = shift;
commit 41ab6a780f81736ca9b10f337fc38f8ac36aede2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 13:11:21 2012 +0100
The from_zone parameter is not used anywhere.
diff --git a/web/modules/rhn/RHN/Date.pm b/web/modules/rhn/RHN/Date.pm
index a4cc6dd..21bca8b 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.pm
@@ -33,7 +33,7 @@ Params::Validate::validation_options(strip_leading => "-");
sub new {
my $class = shift;
- my %params = validate(@_, { -now => 0, -epoch => 0, -string => 0, -user => 0, from_zone => 0, source => 0 });
+ my %params = validate(@_, { -now => 0, -epoch => 0, -string => 0, -user => 0, source => 0 });
my $time_zone = 'local';
if ($params{user}) {
@@ -62,14 +62,7 @@ sub new {
$dt = DateTime->from_epoch(epoch => $params{epoch}, time_zone => $time_zone);
}
elsif (exists $params{string}) {
- my $from_zone = $params{from_zone};
- if ($from_zone) {
- $dt = DateTime->from_epoch(epoch => date_to_epoch($params{string}, $from_zone),
- time_zone => $time_zone);
- }
- else {
- $dt = DateTime->from_epoch(epoch => str2time($params{string}), time_zone => $time_zone);
- }
+ $dt = DateTime->from_epoch(epoch => str2time($params{string}), time_zone => $time_zone);
}
else {
throw "Missing parameter to RHN::Date constructor";
commit 5c38b37b46ac4b9dd449a73b308a0e39ff10af1b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 13:07:57 2012 +0100
Use RHN::Date where it is used (only).
diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm
index b73da67..04df4a5 100644
--- a/web/modules/rhn/RHN/DB/ChannelEditor.pm
+++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm
@@ -27,8 +27,6 @@ use RHN::ErrataTmp;
use RHN::ErrataEditor;
use RHN::ChannelEditor;
-use RHN::Date ();
-
use Params::Validate qw/:all/;
Params::Validate::validation_options(strip_leading => "-");
diff --git a/web/modules/sniglets/Sniglets/Errata.pm b/web/modules/sniglets/Sniglets/Errata.pm
index 20ca9f0..77e6924 100644
--- a/web/modules/sniglets/Sniglets/Errata.pm
+++ b/web/modules/sniglets/Sniglets/Errata.pm
@@ -28,6 +28,7 @@ use PXT::Utils;
use PXT::HTML;
use RHN::Exception;
+use RHN::Date ();
sub register_tags {
my $class = shift;
diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
index 3e194d6..f8c6e7f 100644
--- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
@@ -32,6 +32,8 @@ use RHN::Form::Widget::Select;
use Params::Validate;
Params::Validate::validation_options(strip_leading => "-");
+use RHN::Date ();
+
use RHN::DB;
our @ISA = qw/Sniglets::ListView::List/;
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index 7a8ac33..1c3a2fa 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -32,6 +32,8 @@ use RHN::Exception;
use POSIX;
+use RHN::Date ();
+
sub register_tags {
my $class = shift;
my $pxt = shift;
commit 5a0049556ca3b8a9fbaca979b1f659a26d4299a3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 8 20:55:14 2012 +0100
490524 - Avoid initializing the object with local only to call time_zone right away.
Addressing
[error] Execution of /var/www/html/network/monitoring/scout/index.pxt failed at Thu Nov 8 19:52:45 2012: Cannot determine local time zone
at /usr/lib/perl5/site_perl/5.8.8/DateTime/TimeZone/Local.pm line 27
DateTime::TimeZone::Local::local_time_zone() called at /usr/lib/perl5/site_perl/5.8.8/DateTime/TimeZone.pm line 54
DateTime::TimeZone::new('undef', 'name', 'local') called at /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/DateTime.pm line 1523
DateTime::set_time_zone('DateTime=HASH(0x2ad35619d7c0)', 'local') called at /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/DateTime.pm line 451
DateTime::from_epoch('undef', 'epoch', 1352391915, 'time_zone', 'local') called at /usr/lib/perl5/vendor_perl/5.8.8/RHN/Date.pm line 65
RHN::Date::new('undef', 'string', '2012-11-08 17:25:15', 'user', 'RHN::User=HASH(0x2ad354c10ac0)') called at /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB/User.pm line 428
diff --git a/web/modules/rhn/RHN/Date.pm b/web/modules/rhn/RHN/Date.pm
index c80099e..a4cc6dd 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.pm
@@ -35,6 +35,11 @@ sub new {
my $class = shift;
my %params = validate(@_, { -now => 0, -epoch => 0, -string => 0, -user => 0, from_zone => 0, source => 0 });
+ my $time_zone = 'local';
+ if ($params{user}) {
+ $time_zone = $params{user}->get_timezone;
+ }
+
my $dt;
if (exists $params{source}) {
my $from = $params{source};
@@ -51,19 +56,19 @@ sub new {
$dt = $from->clone;
}
elsif (exists $params{now}) {
- $dt = DateTime->now(time_zone => "local");
+ $dt = DateTime->now(time_zone => $time_zone);
}
elsif (exists $params{epoch}) {
- $dt = DateTime->from_epoch(epoch => $params{epoch}, time_zone => "local");
+ $dt = DateTime->from_epoch(epoch => $params{epoch}, time_zone => $time_zone);
}
elsif (exists $params{string}) {
my $from_zone = $params{from_zone};
if ($from_zone) {
$dt = DateTime->from_epoch(epoch => date_to_epoch($params{string}, $from_zone),
- time_zone => "local");
+ time_zone => $time_zone);
}
else {
- $dt = DateTime->from_epoch(epoch => str2time($params{string}), time_zone => "local");
+ $dt = DateTime->from_epoch(epoch => str2time($params{string}), time_zone => $time_zone);
}
}
else {
@@ -72,10 +77,6 @@ sub new {
my $self = bless { dt => $dt }, $class;
- if ($params{user}) {
- $self->time_zone($params{user}->get_timezone);
- }
-
return $self;
}
commit 9a6c6950d8d66f61d6f07ad60bcaa9ed020d2e31
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 8 17:07:31 2012 +0100
490524 - Shortcut RHN::Date->now->long_date, avoiding DateTime.
Addressing
[error] Execution of /var/www/html/network/systems/details/history/snapshots/rollback.pxt failed at Thu Nov 8 20:43:07 2012: RHN::Exception: Cannot determine local time zone
at /usr/lib/perl5/site_perl/5.8.8/DateTime/TimeZone/Local.pm line 27
DateTime::TimeZone::Local::local_time_zone() called at /usr/lib/perl5/site_perl/5.8.8/DateTime/TimeZone.pm line 54
DateTime::TimeZone::new('undef', 'name', 'local') called at /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/DateTime.pm line 1523
DateTime::set_time_zone('DateTime=HASH(0x2b61839fdd10)', 'local') called at /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/DateTime.pm line 451
DateTime::from_epoch('undef', 'epoch', 1352403787, 'time_zone', 'local') called at /usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi/DateTime.pm line 457
DateTime::now('DateTime', 'time_zone', 'local') called at /usr/lib/perl5/vendor_perl/5.8.8/RHN/Date.pm line 44
RHN::Date::new('undef', 'now', 1) called at /usr/lib/perl5/vendor_perl/5.8.8/RHN/Date.pm line 96
diff --git a/web/modules/rhn/RHN/DB/SystemSnapshot.pm b/web/modules/rhn/RHN/DB/SystemSnapshot.pm
index 0e59ee0..a4b45a2 100644
--- a/web/modules/rhn/RHN/DB/SystemSnapshot.pm
+++ b/web/modules/rhn/RHN/DB/SystemSnapshot.pm
@@ -406,7 +406,7 @@ sub rollback_to_snapshot {
($pkg_delta_aid, $transaction) = RHN::Scheduler->schedule_package_sync(org_id => $org_id,
user_id => $user_id,
server_id => $sid,
- earliest => RHN::Date->now->long_date,
+ earliest => RHN::Date->now_long_date,
comparison => $comparison,
action_name => "Package sync to System Snapshot",
transaction => $transaction,
@@ -432,7 +432,7 @@ sub rollback_to_snapshot {
if (@{$files}) {
my $deploy_aid;
- my $now = RHN::Date->now->long_date;
+ my $now = RHN::Date->now_long_date;
($deploy_aid, $transaction) = RHN::Scheduler->schedule_config_action(-org_id => $org_id,
-user_id => $user_id,
diff --git a/web/modules/rhn/RHN/DB/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index 025487c..300b805 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.pm
@@ -51,7 +51,7 @@ sub create {
my $url = shift;
my $expires = shift;
- $expires ||= RHN::Date->now->long_date;
+ $expires ||= RHN::Date->now_long_date;
my $token;
while (1) {
diff --git a/web/modules/rhn/RHN/Date.pm b/web/modules/rhn/RHN/Date.pm
index 5df2daa..c80099e 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.pm
@@ -21,6 +21,7 @@ use RHN::Exception qw/throw/;
use Date::Parse;
use DateTime;
+use POSIX ();
use Params::Validate;
Params::Validate::validation_options(strip_leading => "-");
@@ -94,6 +95,12 @@ sub now {
return $class->new(now => 1);
}
+my $LONG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S";
+# Shortcut to now->long_date, avoiding DateTime
+sub now_long_date {
+ return POSIX::strftime($LONG_DATE_FORMAT, localtime);
+}
+
# construct a date from constituent elements
sub construct {
my $class = shift;
@@ -169,7 +176,7 @@ sub user_short_timezone {
sub long_date {
my $self = shift;
- return $self->strftime("%Y-%m-%d %H:%M:%S");
+ return $self->strftime($LONG_DATE_FORMAT);
}
# helper function for our classical "short_date" format; zoneless
diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
index c9d45f3..3e194d6 100644
--- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
@@ -227,7 +227,7 @@ sub apply_unscheduled_errata {
my $system = RHN::Server->lookup(-id => $sid);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my $count = RHN::Scheduler->schedule_all_errata_updates_for_system(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
@@ -564,7 +564,7 @@ sub apply_errata_cb {
my $errata_set = RHN::Set->lookup(-label => $pxt->dirty_param('set_label'), -uid => $pxt->user->id);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my @action_ids = RHN::Scheduler->schedule_errata_updates_for_system(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index de23f38..b033187 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -1195,7 +1195,7 @@ sub remove_packages_cb {
my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my $actions_scheduled =
RHN::Scheduler->schedule_system_package_action(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
@@ -1295,7 +1295,7 @@ sub install_packages_cb {
my $package_set = RHN::Set->lookup(-label => $package_set_label, -uid => $pxt->user->id);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my $actions_scheduled =
RHN::Scheduler->schedule_system_package_action(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index 4a69977..b23cf9a 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -1142,7 +1142,7 @@ sub apply_errata_cb {
$errata_set->empty;
$errata_set->add($eid);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my @action_ids = RHN::Scheduler->schedule_errata_updates_for_systems(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
@@ -1248,7 +1248,7 @@ sub install_package {
my $system_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my $action_id = RHN::Scheduler->schedule_package_install(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index aca6c55..7a8ac33 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -404,7 +404,7 @@ sub server_set_actions_cb {
my $num_systems = $system_set->contents;
if ($pxt->dirty_param('sscd_hw_prof_update_conf')) {
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my $action_id = RHN::Scheduler->schedule_hardware_refresh(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
@@ -414,7 +414,7 @@ sub server_set_actions_cb {
$pxt->redirect('/rhn/systems/ssm/misc/Index.do');
}
elsif ($pxt->dirty_param('sscd_pkg_prof_update_conf')) {
- my $earliest_date = RHN::Date->now->long_date;
+ my $earliest_date = RHN::Date->now_long_date;
my @action_ids = RHN::Scheduler->sscd_schedule_package_refresh(-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-earliest => $earliest_date,
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index ef0e15b..e617245 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -481,7 +481,7 @@ sub server_prefs_form_cb {
my $system_set = new RHN::DB::Set 'system_list', $pxt->user->id;
- RHN::Scheduler->schedule_all_errata_for_systems(-earliest => RHN::Date->now->long_date,
+ RHN::Scheduler->schedule_all_errata_for_systems(-earliest => RHN::Date->now_long_date,
-org_id => $pxt->user->org_id,
-user_id => $pxt->user->id,
-server_set => $system_set,
11 years, 6 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
12 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 8e900a389b15a70345c80a6e3d724b8ed8e05cd1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 9 13:42:39 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.6-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index abd4371..9a5c381 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.5
+Version: 1.9.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 09 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.6-1
+- backported translation changes from zanata
+
* Mon Nov 05 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.5-1
- replace remaining DTD paths to www.hibernate.org/dtd with 3.2 default
hibernate.sourceforge.net
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5dbff70..b6b6cd2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.5-1 java/
+1.9.6-1 java/
commit d7139a15fedc3979459714c1e5e6b4e17f925ce1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 6 15:28:10 2012 +0100
triple f is rarely needed in english
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index cda2490..917ae8e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index 2a2fa6d..909bd61 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index aefed5d..0c121e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index e72acfb..20a2148 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 84d3464..7ebb221 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index a951d58..ab23eb7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 621c3a9..355ba27 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index b9175fe..ffdb591 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index c42b50b..2000cae 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 0c10f57..24097a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -207,7 +207,7 @@
</trans-unit>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">General Stufff</context>
+ <context context-type="sourcefile">General Stuff</context>
</context-group>
<trans-unit id="yes">
<source>Yes</source>
11 years, 6 months
Changes to 'refs/tags/cobbler20-2.0.11-5'
by Tomas Lestach
Tag 'cobbler20-2.0.11-5' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-08 15:08 +0000
Tagging package [cobbler20] version [2.0.11-5] in directory [spec-tree/cobbler20/].
Changes since spacewalk-backend-1.9.6-1:
Tomas Lestach (2):
866326 - catch cheetah exception in mod_pythod/mod_wsgi and forward it as 500 SERVER ERROR
Automatic commit of package [cobbler20] minor release [2.0.11-5].
---
rel-eng/packages/cobbler20 | 2
spec-tree/cobbler20/build.py.props | 1
spec-tree/cobbler20/catch_cheetah_exception.patch | 60 ++++++++++++++++++++++
spec-tree/cobbler20/cobbler20.spec | 8 ++
4 files changed, 69 insertions(+), 2 deletions(-)
---
11 years, 6 months
2 commits - rel-eng/packages spec-tree/cobbler20
by Tomas Lestach
rel-eng/packages/cobbler20 | 2
spec-tree/cobbler20/build.py.props | 1
spec-tree/cobbler20/catch_cheetah_exception.patch | 60 ++++++++++++++++++++++
spec-tree/cobbler20/cobbler20.spec | 8 ++
4 files changed, 69 insertions(+), 2 deletions(-)
New commits:
commit 65dad4d171db01371b7533f996b30a6a8988bb84
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 8 16:08:01 2012 +0100
Automatic commit of package [cobbler20] minor release [2.0.11-5].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index 6670c94..17418f7 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-4 spec-tree/cobbler20/
+2.0.11-5 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index ae6cb1f..2bf3985 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 4%{?dist}
+Release: 5%{?dist}
Source0: cobbler-%{version}.tar.gz
Patch0: catch_cheetah_exception.patch
Group: Applications/System
@@ -427,6 +427,10 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Thu Nov 08 2012 Tomas Lestach <tlestach(a)redhat.com> 2.0.11-5
+- 866326 - catch cheetah exception in mod_pythod/mod_wsgi and forward it as 500
+ SERVER ERROR
+
* Fri Oct 19 2012 Jan Pazdziora 2.0.11-4
- We need one extra package in the dependency chain to prefer cobbler20 upon
fresh installation.
commit 747754ef62ef3535fabc8d3f20e63c7e20c8ba91
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 8 11:56:57 2012 +0100
866326 - catch cheetah exception in mod_pythod/mod_wsgi and forward it as 500 SERVER ERROR
- cobbler's mod_pythod/mod_wsgi behave differently and thus returned different
output on rhel5/rhel6, when cheetah failed to parse the uploaded
kickstart file
- this commit unifies the behavior and in case of cheetah exception 500
is returned with the cheetah exception in the response body
diff --git a/spec-tree/cobbler20/build.py.props b/spec-tree/cobbler20/build.py.props
index ccc90ea..20c6311 100644
--- a/spec-tree/cobbler20/build.py.props
+++ b/spec-tree/cobbler20/build.py.props
@@ -1,3 +1,4 @@
[buildconfig]
tagger = spacewalk.releng.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
diff --git a/spec-tree/cobbler20/catch_cheetah_exception.patch b/spec-tree/cobbler20/catch_cheetah_exception.patch
new file mode 100644
index 0000000..2530ed0
--- /dev/null
+++ b/spec-tree/cobbler20/catch_cheetah_exception.patch
@@ -0,0 +1,60 @@
+diff -ru cobbler-2.0.11.orig/scripts/services.py cobbler-2.0.11/scripts/services.py
+--- cobbler-2.0.11.orig/scripts/services.py 2012-11-08 14:06:07.000000000 +0100
++++ cobbler-2.0.11/scripts/services.py 2012-11-08 14:06:52.000000000 +0100
+@@ -86,7 +86,12 @@
+ mode = form.get('op','index')
+
+ func = getattr( cw, mode )
+- content = func( **form )
++ try:
++ content = func( **form )
++ except Exception, (err):
++ req.status = apache.HTTP_INTERNAL_SERVER_ERROR
++ req.write(err.faultString)
++ return apache.OK
+
+ # apache.log_error("%s:%s ... %s" % (my_user, my_uri, str(form)))
+ req.content_type = "text/plain;charset=utf-8"
+diff -ru cobbler-2.0.11.orig/scripts/services.wsgi cobbler-2.0.11/scripts/services.wsgi
+--- cobbler-2.0.11.orig/scripts/services.wsgi 2012-11-08 14:06:07.000000000 +0100
++++ cobbler-2.0.11/scripts/services.wsgi 2012-11-08 14:06:46.000000000 +0100
+@@ -75,22 +75,26 @@
+
+ # Execute corresponding operation on the CobblerSvc object:
+ func = getattr( cw, mode )
+- content = func( **form )
++ try:
++ content = func( **form )
+
+- content = unicode(content).encode('utf-8')
+- status = '200 OK'
++ content = unicode(content).encode('utf-8')
++ status = '200 OK'
++
++ if content.find("# *** ERROR ***") != -1:
++ status = '500 SERVER ERROR'
++ print("possible cheetah template error")
+
+- if content.find("# *** ERROR ***") != -1:
++ # TODO: Not sure these strings are the right ones to look for...
++ elif content.find("# profile not found") != -1 or \
++ content.find("# system not found") != -1 or \
++ content.find("# object not found") != -1:
++ print("content not found: %s" % my_uri)
++ status = "404 NOT FOUND"
++ except Exception, (err):
+ status = '500 SERVER ERROR'
+- print("possible cheetah template error")
+-
+- # TODO: Not sure these strings are the right ones to look for...
+- elif content.find("# profile not found") != -1 or \
+- content.find("# system not found") != -1 or \
+- content.find("# object not found") != -1:
+- print("content not found: %s" % my_uri)
+- status = "404 NOT FOUND"
+-
++ content = err.faultString
++
+ # req.content_type = "text/plain;charset=utf-8"
+ response_headers = [('Content-type', 'text/plain;charset=utf-8'),
+ ('Content-Length', str(len(content)))]
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index b4fb15f..ae6cb1f 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -9,6 +9,7 @@ AutoReq: no
Version: 2.0.11
Release: 4%{?dist}
Source0: cobbler-%{version}.tar.gz
+Patch0: catch_cheetah_exception.patch
Group: Applications/System
Requires: python >= 2.3
@@ -89,6 +90,7 @@ a XMLRPC API for integration with other applications.
%prep
%setup -q -n cobbler-%{version}
+%patch0 -p1
%build
%{__python} setup.py build
11 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.9.6-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-07 16:11 +0000
Tagging package [spacewalk-backend] version [1.9.6-1] in directory [backend/].
Changes since spacewalk-backend-1.9.5-1:
Jan Pazdziora (2):
Fixing pylint error.
Automatic commit of package [spacewalk-backend] release [1.9.6-1].
---
backend/common/rhnCache.py | 1 -
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---
11 years, 7 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4d1cf8189a0bc19fdb2352e772cefa3c3f701832
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 7 17:11:13 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.6-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c47e3d7..4ae128c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.5
+Version: 1.9.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 07 2012 Jan Pazdziora 1.9.6-1
+- Fixing pylint error.
+
* Wed Nov 07 2012 Jan Pazdziora 1.9.5-1
- Using fcntl.lockf should avoid any need for packing.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 774d201..0c6a323 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.5-1 backend/
+1.9.6-1 backend/
11 years, 7 months
backend/common
by Jan Pazdziora
backend/common/rhnCache.py | 1 -
1 file changed, 1 deletion(-)
New commits:
commit db49c75c453d28e49bfdb166b2c7a39a5abbb8a6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 7 17:10:33 2012 +0100
Fixing pylint error.
Addressing
************* Module spacewalk.common.rhnCache
W0611: 24: Unused import pack
diff --git a/backend/common/rhnCache.py b/backend/common/rhnCache.py
index 632211f..12d21c8 100644
--- a/backend/common/rhnCache.py
+++ b/backend/common/rhnCache.py
@@ -21,7 +21,6 @@ import gzip
import cPickle
import fcntl
import sys
-from struct import pack
from stat import ST_MTIME
from errno import EEXIST
11 years, 7 months