client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 13 ++++++----
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit d15c755d84072c980cc6e68ab023eeb890f5a665
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 19 18:51:08 2011 +0100
602609 - fix DeprecationWarning when using gtk.MessageDialog()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
index 4dfd37d..61f97e0 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
@@ -66,11 +66,14 @@ class MessageWindow:
buttons = gtk.BUTTONS_YES_NO
style = gtk.MESSAGE_QUESTION
- # this seems to be wordwrapping text passed to
- # it, which is making for ugly error messages
- self.dialog = gtk.MessageDialog(parent, 0, style, buttons, text)
- self.dialog.label.set_line_wrap(False)
- self.dialog.label.set_use_markup(True)
+ self.dialog = gtk.MessageDialog(parent, 0, style, buttons)
+ # Work around for bug #602609
+ try:
+ self.dialog.vbox.get_children()[0].get_children()[1].\
+ get_children()[0].set_line_wrap(False)
+ except:
+ self.dialog.label.set_line_wrap(False)
+ self.dialog.set_markup(text)
if default == "no":
self.dialog.set_default_response(0)
elif default == "yes" or default == "ok":
13 years, 4 months
.gitignore
by Tomas Lestach
.gitignore | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 657248ac79769bc03dc64f634c3255a39ad656aa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 18:52:17 2011 +0100
updating spacewalk-search paths in .gitignore
diff --git a/.gitignore b/.gitignore
index 836f5db..0983c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,13 +22,13 @@ java/*.jar
java/*.txt
java/*.out
thrift/gen-*
-search-server/.classpath
-search-server/.project
-search-server/build
-search-server/lib
-search-server/dist
-search-server/rhn-search.pid
-search-server/rhn_search_daemon.log
+search-server/spacewalk-search/.classpath
+search-server/spacewalk-search/.project
+search-server/spacewalk-search/build
+search-server/spacewalk-search/lib
+search-server/spacewalk-search/dist
+search-server/spacewalk-search/rhn-search.pid
+search-server/spacewalk-search/rhn_search_daemon.log
*~
.project
.pydevproject
13 years, 4 months
rel-eng/comps
by Tomas Lestach
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 3 ---
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 3 ---
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 3 ---
3 files changed, 9 deletions(-)
New commits:
commit b46c1ce0f460848cd9eca44bdab59eab00bb1db4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 18:45:53 2011 +0100
removing ehcache* from all server comps
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index 42041fe..3aa5091 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -12,9 +12,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">cx_Oracle</packagereq>
- <packagereq type="default">ehcache</packagereq>
- <packagereq type="default">ehcache-hibernate</packagereq>
- <packagereq type="default">ehcache-javadoc</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
index 49920da..63d3d02 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
@@ -12,9 +12,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">cx_Oracle</packagereq>
- <packagereq type="default">ehcache</packagereq>
- <packagereq type="default">ehcache-hibernate</packagereq>
- <packagereq type="default">ehcache-javadoc</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index bd29281..5906ec6 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -29,9 +29,6 @@
<packagereq type="default">dom4j-demo</packagereq>
<packagereq type="default">dom4j-manual</packagereq>
<packagereq type="default">dom4j-repolib</packagereq>
- <packagereq type="default">ehcache</packagereq>
- <packagereq type="default">ehcache-hibernate</packagereq>
- <packagereq type="default">ehcache-javadoc</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">heirloom-pkgtools</packagereq>
<packagereq type="default">hibernate3</packagereq>
13 years, 4 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/data/rh_register.glade | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 62fdbf568bfcf3bf7ad646d4aa52987ba30cd05d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 19 16:27:59 2011 +0100
617066 - fix "Why register" dialog size
some languages (e.g. Malayalam) need more space and this dialog it then too high
Lets take from height and give it to weight.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index eb42556..72a1a83 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -2712,7 +2712,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">600</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -2854,7 +2854,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -2948,7 +2948,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -3042,7 +3042,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -3136,7 +3136,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4273,7 +4273,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">600</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4376,7 +4376,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4470,7 +4470,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4564,7 +4564,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4659,7 +4659,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
+ <property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
13 years, 4 months
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/SatInstall.pm | 33 ---------------------------------
1 file changed, 33 deletions(-)
New commits:
commit 8d28b8155c4476c432abb9d71fe14d1b4d3750c7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 16:05:51 2011 +0100
Removing RHN::DB::SatInstall::clear_db, it was last referenced by rhn-populate-database.pl.
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm
index e65f789..fa43a33 100644
--- a/web/modules/rhn/RHN/DB/SatInstall.pm
+++ b/web/modules/rhn/RHN/DB/SatInstall.pm
@@ -71,39 +71,6 @@ EOQ
return %nls_database_parameters;
}
-sub clear_db {
- my $class = shift;
-
- my $dbh = RHN::DB->connect;
-
- if (grep { $dbh->{Name} eq $_ } qw/webdev webqa web phx live prod/) {
- throw "No! Attempt to clear db: '" . $dbh->{Name} . "'\n";
- }
-
- my $select_sth = $dbh->prepare(<<EOQ);
- SELECT 'drop ' || UO.object_type ||' '|| UO.object_name AS DROP_STMT
- FROM user_objects UO
- WHERE UO.object_type NOT IN ('TABLE', 'INDEX', 'TRIGGER', 'LOB')
-UNION
- SELECT 'drop ' || UO.object_type ||' '|| UO.object_name
- || ' cascade constraints' AS DROP_STMT
- FROM user_objects UO
- WHERE UO.object_type = 'TABLE'
- AND UO.object_name NOT LIKE '%$%'
-EOQ
-
- $select_sth->execute();
-
- while (my ($drop_stmt) = $select_sth->fetchrow()) {
- my $drop_sth = $dbh->prepare($drop_stmt);
- $drop_sth->execute();
- }
-
- $dbh->commit;
-
- return;
-}
-
sub update_monitoring_config {
my $class = shift;
my $mon_config = shift;
13 years, 4 months
Changes to 'refs/tags/spacewalk-setup-1.3.8-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.3.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-19 15:03 +0000
Tagging package [spacewalk-setup] version [1.3.8-1] in directory [spacewalk/setup/].
Changes since spacewalk-schema-1.3.13-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.3.8-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 4 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d7a60334c511fb78d8815e699ce3d24e315fb18c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 16:03:27 2011 +0100
Automatic commit of package [spacewalk-setup] release [1.3.8-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 9aa289b..41e0f03 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.3.7-1 spacewalk/setup/
+1.3.8-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index ce6b095..4a4980f 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.3.7
+Version: 1.3.8
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 Jan 19 2011 Jan Pazdziora 1.3.8-1
+- Call spacewalk-sql instead of rhn-populate-database.pl.
+
* Tue Jan 18 2011 Jan Pazdziora 1.3.7-1
- The db-sid is long gone, using db-name now.
- As db-protocol is no longer processed (supported), removing.
13 years, 4 months
Changes to 'refs/tags/spacewalk-schema-1.3.13-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.3.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-19 15:02 +0000
Tagging package [spacewalk-schema] version [1.3.13-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.3.22-1:
Jan Pazdziora (7):
Show --verbose and --select-mode options in usage; also show usage when Getopt::Long::GetOptions fails.
Added --select-mode-direct option to print out the sqlplus/psql output right when we get it.
Call spacewalk-sql instead of rhn-populate-database.pl.
Removing rhn-populate-database.pl, we now use the generic spacewalk-sql.
Removing pgsql-deploy.sh, we now have spacewalk-postgresql and proper support for PostgreSQL backend in spacewalk-setup.
Using array should be faster than appending string.
Automatic commit of package [spacewalk-schema] release [1.3.13-1].
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 9 +
schema/spacewalk/spacewalk-sql | 49 ++++++++--
scripts/pgsql-deploy.sh | 59 ------------
spacewalk/admin/Makefile.admin | 1
spacewalk/admin/rhn-populate-database.pl | 144 -------------------------------
spacewalk/admin/spacewalk-admin.spec | 1
spacewalk/setup/lib/Spacewalk/Setup.pm | 38 ++++----
8 files changed, 68 insertions(+), 235 deletions(-)
---
13 years, 4 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 12d0f6def2adbfd8661336211430b1aaa95a6e03
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 16:02:40 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.3.13-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 0443e78..5b14a22 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.3.12-1 schema/spacewalk/
+1.3.13-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 6c6bee6..300c282 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.3.12
+Version: 1.3.13
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -64,6 +64,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jan 19 2011 Jan Pazdziora 1.3.13-1
+- Using array should be faster than appending string.
+- Added --select-mode-direct option to print out the sqlplus/psql output right
+ when we get it.
+- Show --verbose and --select-mode options in usage; also show usage when
+ Getopt::Long::GetOptions fails.
+
* Wed Jan 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.12-1
- fixed failed 1.1 -> 1.3 upgrade test
13 years, 4 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-sql | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 45281adb4a131f2dcc3ce38fed18700c850277db
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 19 16:00:19 2011 +0100
Using array should be faster than appending string.
diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql
index d9e5fd5..ad831d8 100755
--- a/schema/spacewalk/spacewalk-sql
+++ b/schema/spacewalk/spacewalk-sql
@@ -86,21 +86,21 @@ if ($options{db_backend} eq 'oracle') {
die "The config file [$config_file] specifies unknown db_backend [$options{db_backend}] \n";
}
-my $out = '';
+my @out;
while (<$rfh>) {
if ($select_direct) {
print;
}
- $out .= $_;
+ push @out, $_;
}
close $rfh;
waitpid $pid, 0;
if ($?) {
my $ret = $? >> 8;
- print STDERR $out;
+ print STDERR @out;
exit $ret;
} elsif ($select_mode) {
- print $out;
+ print @out;
}
exit;
13 years, 4 months