branding/templates web/html web/modules
by Jan Pazdziora
branding/templates/c.pxt | 10 ----------
branding/templates/equals_sign.pxt | 9 ---------
web/html/errata_hidden/rh_template.pxt | 9 ---------
web/modules/pxt/PXT/Request.pm | 15 ---------------
web/modules/sniglets/Sniglets/HTML.pm | 18 ------------------
web/modules/sniglets/Sniglets/Navi/Style.pm | 10 +---------
6 files changed, 1 insertion(+), 70 deletions(-)
New commits:
commit 33563c851e4e83148b2b7ef6de3faef87713a08c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 4 15:43:23 2010 +0100
Drop rhn-browser-css-compliance and browser_css_compliance and always assume some CSS compliance.
Mozilla/4.[567] which we were specifically targeting is no longer of interest.
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt
index c587ec0..77540f1 100644
--- a/branding/templates/c.pxt
+++ b/branding/templates/c.pxt
@@ -10,14 +10,6 @@
<pxt-include-late file="/templates/header.pxt" />
<body><div class="wrap" id="top-wrap">
- <rhn-browser-css-compliance at_most="0">
- <div id="broken-browser-warning">
- <h1>
- You are using an unsupported browser.
- </h1>
- <a href="/help/browser-info.pxt">More Info</a>
- </div>
- </rhn-browser-css-compliance>
<rhn-navi-nav depth="0" style="topnav"/>
<pxt-include-late file="/network/components/status_bar/main.pxi" />
</div>
@@ -29,10 +21,8 @@
<grail-canvas mode="left_menu_canvas">
<rhn-navi-nav depth="1" style="sidenav"/>
</grail-canvas>
-<rhn-browser-css-compliance at_least="1">
<grail-canvas mode="legend_canvas">
</grail-canvas>
-</rhn-browser-css-compliance>
<rhn-require acl="global_config(chat_enabled)">
<br/>
diff --git a/branding/templates/equals_sign.pxt b/branding/templates/equals_sign.pxt
index 9cdc58e..e8b3104 100644
--- a/branding/templates/equals_sign.pxt
+++ b/branding/templates/equals_sign.pxt
@@ -14,15 +14,6 @@ Header at the top, sidebar at the left, mainview at the right, footer at the bot
<body>
<div id="wrap">
- <rhn-browser-css-compliance at_most="0">
- <div id="broken-browser-warning">
- <h1>
- You are using an unsupported browser.
- </h1>
- <a href="/help/browser-info.pxt">More Info</a>
- </div>
- </rhn-browser-css-compliance>
-
<rhn-navi-nav depth="0" style="topnav"/>
<pxt-include-late file="/network/components/status_bar/main.pxi" />
diff --git a/web/html/errata_hidden/rh_template.pxt b/web/html/errata_hidden/rh_template.pxt
index a5f2aa5..bcc9dcd 100644
--- a/web/html/errata_hidden/rh_template.pxt
+++ b/web/html/errata_hidden/rh_template.pxt
@@ -13,15 +13,6 @@
<div id="wrap">
- <rhn-browser-css-compliance at_most="0">
- <div id="broken-browser-warning">
- <h1>
- You are using an unsupported browser.
- </h1>
- <a href="/help/browser-info.pxt">More Info</a>
- </div>
- </rhn-browser-css-compliance>
-
<rhn-navi-nav depth="0" style="topnav" file="/nav/public_errata.xml"/>
<grail-canvas mode="main" />
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index 3855b09..06c516b 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -978,21 +978,6 @@ sub use_sessions {
return $self->{use_sessions};
}
-# return a vague idea of how well the browser supports CSS. note that
-# NN gets a 0, everything else a 1, roughly corresponding to CSS-1
-# compliance
-
-sub browser_css_compliance {
- my $self = shift;
-
- my $ua = $self->header_in('User-Agent');
- if ($ua and $ua =~ m(Mozilla/4.[567])) {
- return 0;
- }
-
- return 1;
-}
-
package PXT::Debug;
sub log {
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index 020fead..c1fe420 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -35,8 +35,6 @@ sub register_tags {
$pxt->register_tag("rhn-creation-link", \&creation_link);
$pxt->register_tag("rhn-deletion-link", \&deletion_link);
- $pxt->register_tag("rhn-browser-css-compliance", \&browser_css_compliance);
-
$pxt->register_tag("rhn-toolbar", \&toolbar);
$pxt->register_tag("rhn-checkable", \&rhn_checkable, 10);
@@ -214,22 +212,6 @@ sub unless_var {
return;
}
-sub browser_css_compliance {
- my $pxt = shift;
- my %attr = @_;
-
- my $block = $attr{__block__};
-
- if (defined (my $least = $attr{at_least})) {
- return $block if $pxt->browser_css_compliance >= $least;
- }
- elsif (defined(my $most = $attr{at_most})) {
- return $block if $pxt->browser_css_compliance <= $most;
- }
-
- return;
-}
-
my %refresh_speeds =
( fast => [ [ 0, "None" ],
[ 5, "5 seconds" ],
diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm
index 29b5afc..5f3d62c 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.pm
@@ -154,15 +154,7 @@ package Sniglets::Navi::Style::contentnav;
use base qw/Sniglets::Navi::Style::ul/;
sub recursive_type {
- my $class = shift;
- my $pxt = shift;
-
- if ($pxt->browser_css_compliance > 0) {
- return 'post-order';
- }
- else {
- return "in-order";
- }
+ return 'post-order';
}
sub pre_nav {
14 years, 3 months
client/tools
by Milan Zazrivec
client/tools/rhn-virtualization/virtualization/constants.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 72e10709b87fa115cf75fb3451cf4494e34f2bcb
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 4 14:57:33 2010 +0100
546676 - blocking and nostate are always just running
diff --git a/client/tools/rhn-virtualization/virtualization/constants.py b/client/tools/rhn-virtualization/virtualization/constants.py
index bd45988..aa5c86c 100755
--- a/client/tools/rhn-virtualization/virtualization/constants.py
+++ b/client/tools/rhn-virtualization/virtualization/constants.py
@@ -51,10 +51,15 @@ class PropertyType:
##
# This structure maps the libvirt state enumeration to labels that RHN
# understands.
-#
-VIRT_STATE_NAME_MAP = ( StateType.NOSTATE, # VIR_DOMAIN_NOSTATE
+# Reasons we don't care about differences between NOSTATE, RUNNING and BLOCKED:
+# 1. technically, the domain is still "running"
+# 2. RHN / RHN Satellite / Spacewalk are not able to display 'blocked' & 'nostate'
+# as valid states
+# 3. to avoid 'Abuse of Service' messages: bugs #230106 and #546676
+
+VIRT_STATE_NAME_MAP = ( StateType.RUNNING, # VIR_DOMAIN_NOSTATE
StateType.RUNNING, # VIR_DOMAIN_RUNNING
- StateType.BLOCKED, # VIR_DOMAIN_BLOCKED
+ StateType.RUNNING, # VIR_DOMAIN_BLOCKED
StateType.PAUSED, # VIR_DOMAIN_PAUSED
StateType.SHUTDOWN, # VIR_DOMAIN_SHUTDOWN
StateType.SHUTOFF, # VIR_DOMAIN_SHUTOFF
14 years, 3 months
reporting/spacewalk-reports.spec
by Jan Pazdziora
reporting/spacewalk-reports.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 118e371911c12c8535f403de44f9f90aef780ca5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 4 14:42:57 2010 +0100
spacewalk-reports: bump up version.
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 4b79f39..90e56d3 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 0.7.1
+Version: 0.8.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
14 years, 3 months
Changes to 'refs/tags/spacewalk-reports-0.7.1-1'
by Jan Pazdziora
Tag 'spacewalk-reports-0.7.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-01-04 13:19 +0000
Tagging package [spacewalk-reports] version [0.7.1-1] in directory [reporting/].
Changes since spacewalk-web-0.8.6-1:
Jan Pazdziora (3):
548751 - handle IOError: [Errno 32] Broken pipe when piping to head.
549370 - set lineending to be just LF, not CRLF.
Automatic commit of package [spacewalk-reports] release [0.7.1-1].
Joshua Roys (1):
Fix the fix to install the tsdb init script
Michael Mraka (1):
removed sha224; java.security.MessageDigest can't handle it
---
monitoring/tsdb/tsdb.spec | 5 +++++
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-report | 8 +++++++-
reporting/spacewalk-reports.spec | 7 ++++++-
schema/spacewalk/common/data/rhnChecksumType.sql | 2 --
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql | 3 ---
6 files changed, 19 insertions(+), 8 deletions(-)
---
14 years, 3 months
rel-eng/packages reporting/spacewalk-reports.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit f709c90fead2edac22cf089de6342a83ac732490
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 4 14:19:41 2010 +0100
Automatic commit of package [spacewalk-reports] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 32927b2..a3aabad 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-0.7.0-1 reporting/
+0.7.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 00740bb..4b79f39 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,5 +42,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Mon Jan 04 2010 Jan Pazdziora 0.7.1-1
+- 549370 - set lineending to be just LF, not CRLF
+- 548751 - handle IOError: [Errno 32] Broken pipe when piping to head
+- Add defattr to spacewalk-reports.spec
+
* Mon Dec 14 2009 Jan Pazdziora 0.7.0-1
- moved reports from spacewalk-backend-0.8.10-1 separate package
14 years, 3 months
2 commits - monitoring/tsdb schema/spacewalk
by Michael Mraka
monitoring/tsdb/tsdb.spec | 5 +++++
schema/spacewalk/common/data/rhnChecksumType.sql | 2 --
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql | 3 ---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2070c477b594ca5d8fe9f731966efe0d88b8b79b
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Dec 10 13:45:33 2009 -0500
Fix the fix to install the tsdb init script
Commit 0c93b6054f5aeb581e3eb2c1a6d93660648ef8f5 installed the tsdb
init script in the proper location... however, it did not (re)move
the previously created directory containing the init script.
diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec
index 95b4020..64a7661 100644
--- a/monitoring/tsdb/tsdb.spec
+++ b/monitoring/tsdb/tsdb.spec
@@ -60,6 +60,11 @@ install -m 755 LocalQueue/rebalance_cron $RPM_BUILD_ROOT%{_bindir}
# Local queue init script (temporary, will be superseded by sysv stuff)
install -D -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script}
+%pre
+if [ -d %{init_script} -a %{init_script} != "/" ]; then
+ rm -rf %{init_script}
+fi
+
%post
if [ $1 -eq 2 ]; then
ls /opt/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log 2>/dev/null | xargs -I file mv file %lqdir
commit c54fd63e9661dd74f913353f0db565cb279b2698
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 4 11:56:44 2010 +0100
removed sha224; java.security.MessageDigest can't handle it
diff --git a/schema/spacewalk/common/data/rhnChecksumType.sql b/schema/spacewalk/common/data/rhnChecksumType.sql
index 8b0a71f..7ce8c5a 100644
--- a/schema/spacewalk/common/data/rhnChecksumType.sql
+++ b/schema/spacewalk/common/data/rhnChecksumType.sql
@@ -22,8 +22,6 @@ insert into rhnChecksumType (id, label, description) values
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha1', 'sha1sum' );
insert into rhnChecksumType (id, label, description) values
- (rhn_checksum_id_seq.nextval, 'sha224', 'sha224sum' );
-insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha256', 'sha256sum' );
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha384', 'sha384sum' );
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
index a035be1..74bf149 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
@@ -4,8 +4,5 @@ update rhnChecksumType
update rhnChecksumType
set description = label || 'sum';
-insert into rhnChecksumType (id, label, description) values
- (rhn_checksum_id_seq.nextval, 'sha224', 'sha224sum' );
-
commit;
14 years, 3 months
reporting/spacewalk-report
by Jan Pazdziora
reporting/spacewalk-report | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d1b0f27a722bc54783242752c4b24373b1f3b46
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 4 13:22:09 2010 +0100
549370 - set lineending to be just LF, not CRLF.
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 60a79d5..c382393 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -124,7 +124,7 @@ if __name__ == '__main__':
initCFG('server')
rhnSQL.initDB(options.db)
- writer = csv.writer(sys.stdout)
+ writer = csv.writer(sys.stdout, lineterminator = "\n")
h = rhnSQL.prepare(report.sql)
h.execute()
14 years, 3 months
reporting/spacewalk-report
by Jan Pazdziora
reporting/spacewalk-report | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit b9f2bbc46d1d4c11e4f8e1dd1abfbc27920a401d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 4 12:27:29 2010 +0100
548751 - handle IOError: [Errno 32] Broken pipe when piping to head.
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index cd1be9e..60a79d5 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -27,6 +27,7 @@ try:
import os
import csv
from optparse import Option, OptionParser
+ import errno
except KeyboardInterrupt:
systemExit(-1, "\nUser interrupted process.")
@@ -189,4 +190,9 @@ if __name__ == '__main__':
# really a stub for better exception handling in the future.
sys.stderr.write("SQL error occurred, traceback follows...\n")
raise
+ except IOError, e:
+ if e.errno == errno.EPIPE:
+ sys.exit(0)
+ else:
+ raise
14 years, 3 months
Changes to 'refs/tags/spacewalk-web-0.8.6-1'
by Michael Mraka
Tag 'spacewalk-web-0.8.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-04 09:45 +0000
Tagging package [spacewalk-web] version [0.8.6-1] in directory [web/].
Changes since spacewalk-backend-0.8.14-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [0.8.6-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
---
14 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 15b051263b1c02aef84e70a5ef1caa059a876652
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 4 10:45:52 2010 +0100
Automatic commit of package [spacewalk-web] release [0.8.6-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8e2349d..68c7c22 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.8.5-1 web/
+0.8.6-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index d20120e..55d147b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.5
+Version: 0.8.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -277,6 +277,8 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jan 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.6-1
+- more dead code removed
* Sat Dec 26 2009 Jan Pazdziora 0.8.5-1
- more dead code removals
14 years, 3 months