java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14 ++++------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c08348142432e7176f1866135c75c3771e26219a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 26 15:00:47 2010 +0200
removing need of setNvreUpper method in PackageOverview
addressing:
javax.servlet.ServletException: com.redhat.rhn.common.util.MethodNotFoundException: Could not find method called: setNvreUpper in class: com.redhat.rhn.frontend.dto.PackageOverview with params: [type: java.lang.String, value: AMANDA-2.5.0P2-4-I386]
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index d44526f..523babc 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -249,10 +249,9 @@ ORDER BY name_upper
<mode name="packages_in_errata" class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="eid">
-SELECT DISTINCT P.id id, PN.name || '-' || PE.version
+SELECT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre,
- UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) as nvre_upper
+ || '-' || PA.label package_nvre
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -263,17 +262,16 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY nvre_upper
+ ORDER BY UPPER(PN.name), PE.version, PE.release, PE.epoch, PA.label, P.id
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_tmp_errata" class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="eid">
-SELECT DISTINCT P.id id, PN.name || '-' || PE.version
+SELECT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre,
- UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) as nvre_upper
+ || '-' || PA.label package_nvre
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -284,7 +282,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY nvre_upper
+ORDER BY UPPER(PN.name), PE.version, PE.release, PE.epoch, PA.label, P.id
</query>
<elaborator name="package_channels" />
</mode>
13 years, 6 months
2 commits - java/code java/conf
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 ++--
java/conf/cobbler/snippets/keep_system_id | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bb3183abcf9d69bba1092d8104c456b2e3e996f7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 08:31:36 2010 -0400
fixing broken if statement in snippet
diff --git a/java/conf/cobbler/snippets/keep_system_id b/java/conf/cobbler/snippets/keep_system_id
index d092cac..721cd7e 100644
--- a/java/conf/cobbler/snippets/keep_system_id
+++ b/java/conf/cobbler/snippets/keep_system_id
@@ -6,7 +6,7 @@ rhn_keys_found=no
insmod /lib/jbd.o
insmod /lib/ext3.o
-if [ -f /lib/ext4.o ];
+if [ -f /lib/ext4.o ]; then
insmod /lib/ext4.o
fi
commit 4d1eda5bf877d5cb0aec7ae68e08423b52a00f79
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Oct 26 08:31:21 2010 -0400
fixing broken query used by SSM System delete
query would return all columns in rhnServer instead of just the two we need
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index eee8d89..fa417ef 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1252,8 +1252,8 @@ ORDER BY SERVER_ID
WHERE ST.user_id = :user_id
AND ST.label = :set_label
AND ST.element = S.id
- ) X, rhnServer S
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ ) X
+ORDER BY UPPER(NVL(name, '(none)')), id
</query>
<mode name="virtual_systems_in_set" class="com.redhat.rhn.frontend.dto.VirtualSystemOverview">
13 years, 6 months
Changes to 'refs/tags/spacewalk-setup-1.2.13-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.2.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-26 09:51 +0000
Tagging package [spacewalk-setup] version [1.2.13-1] in directory [spacewalk/setup/].
Changes since spacewalk-utils-1.2.6-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.2.13-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 6 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 35e578392de5f98681a1c7505e66df53aae0a21a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 11:51:15 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.2.13-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index ebe271b..d4ec88a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.2.12-1 spacewalk/setup/
+1.2.13-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6a16436..00885c2 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.12
+Version: 1.2.13
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
+* Tue Oct 26 2010 Jan Pazdziora 1.2.13-1
+- When run with the --db-only option, stop after populating the database.
+
* Fri Oct 22 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.12-1
- 612581 - use new spacewalk namespace for spacewalk-setup
13 years, 6 months
Changes to 'refs/tags/spacewalk-utils-1.2.6-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.2.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-26 09:50 +0000
Tagging package [spacewalk-utils] version [1.2.6-1] in directory [utils/].
Changes since spacewalk-backend-1.2.38-1:
Jan Pazdziora (3):
When run with the --db-only option, stop after populating the database.
Blobs (byteas) want double backslashes and octal values.
Automatic commit of package [spacewalk-utils] release [1.2.6-1].
Miroslav Suchý (3):
fix rpmlint error
fix rpmlint error
fix rpmlint error
---
rel-eng/packages/spacewalk-utils | 2 +-
spacewalk/setup/bin/spacewalk-setup | 4 ++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 1 +
utils/spacewalk-dump-schema | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
web/spacewalk-web.spec | 6 +++---
6 files changed, 14 insertions(+), 6 deletions(-)
---
13 years, 6 months
rel-eng/packages utils/spacewalk-utils.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e0cba377d88e1a73234f5f29bf178a84744d5a02
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 11:50:53 2010 +0200
Automatic commit of package [spacewalk-utils] release [1.2.6-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 5a9632f..a0c91f7 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.2.5-1 utils/
+1.2.6-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index f1b77e3..620f586 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.2.5
+Version: 1.2.6
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 26 2010 Jan Pazdziora 1.2.6-1
+- Blobs (byteas) want double backslashes and octal values.
+
* Thu Oct 21 2010 Jan Pazdziora 1.2.5-1
- Adding spacewalk-dump-schema to the Makefile to be added to the rpm.
- Documentation (man page).
13 years, 6 months
2 commits - spacewalk/setup utils/spacewalk-dump-schema
by Jan Pazdziora
spacewalk/setup/bin/spacewalk-setup | 4 ++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 1 +
utils/spacewalk-dump-schema | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit da5d70f5b512f9c2d15fc320c62ceac9e787ad8b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 11:48:38 2010 +0200
Blobs (byteas) want double backslashes and octal values.
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index c43b81a..437a346 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -107,7 +107,7 @@ sub process_table {
no warnings 'uninitialized';
$row->[$i] = "(@{[ join ',', @{$row->[$i]} ]})";
} elsif ($types[$i] eq 'unknown') { # blobs
- $row->[$i] =~ s!(.)! sprintf "\\x%02x", ord($1) !seg;
+ $row->[$i] =~ s!(.)! sprintf "\\\\%03o", ord($1) !seg;
} else {
$row->[$i] =~ s!([\x00-\x1f\x5c])! sprintf "\\x%02x", ord($1) !seg;
}
commit 28387a5c99ea50d739a45b463d9fe097dbe439c5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 10:37:34 2010 +0200
When run with the --db-only option, stop after populating the database.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index dd5781f..d8b30b4 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -83,6 +83,10 @@ else {
die "No idea how to install to database: " . $answers{'db-backend'};
}
+if ($opts{'db-only'}) {
+ exit;
+}
+
remove_old_jvm(\%opts, \%answers);
print Spacewalk::Setup::loc("* Setting up users and groups.\n");
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index cc1121b..279a30f 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -110,6 +110,7 @@ sub parse_options {
"run-cobbler",
"enable-tftp:s",
"external-db",
+ "db-only",
);
my $usage = loc("usage: %s %s\n",
13 years, 6 months
3 commits - web/spacewalk-web.spec
by Miroslav Suchý
web/spacewalk-web.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fc3ac97dd7f6e6cab359a0be03adcfdc02a2fee2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 25 23:18:38 2010 +0200
fix rpmlint error
addressing:
spacewalk-base-minimal.noarch: W: spelling-error %description -l en_US namespace -> name space, name-space, names pace
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 69dea6e..28bff14 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -54,7 +54,7 @@ Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0
%description -n spacewalk-base-minimal
-Independent Perl modules in the RHN:: namespace.
+Independent Perl modules in the RHN:: name-space.
%package -n spacewalk-dobby
Summary: Perl modules and scripts to administer an Oracle database
commit ac844c8fa36e6428dc2bf28601e45960ee6df560
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 25 23:17:56 2010 +0200
fix rpmlint error
addressing:
spacewalk-base-minimal.noarch: W: spelling-error %description -l en_US perl -> Perl, peel, perk
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2a413ac..69dea6e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -54,7 +54,7 @@ Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0
%description -n spacewalk-base-minimal
-Independent perl modules in the RHN:: namespace.
+Independent Perl modules in the RHN:: namespace.
%package -n spacewalk-dobby
Summary: Perl modules and scripts to administer an Oracle database
@@ -64,7 +64,7 @@ Obsoletes: rhn-dobby < 5.3.0
Provides: rhn-dobby = 5.3.0
%description -n spacewalk-dobby
-Dobby is collection of perl modules and scripts to administer an Oracle
+Dobby is collection of Perl modules and scripts to administer an Oracle
database.
commit e8adbc7ff5e531902d44e0bebbe1ab646de46bd5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 25 23:16:38 2010 +0200
fix rpmlint error
addressing:
spacewalk-web.src: W: spelling-error %description -l en_US subpackages -> sub packages, sub-packages, prepackages
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 99e6847..2a413ac 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -13,7 +13,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
%description
This package contains the code for the Spacewalk Web Site.
Normally this source rpm does not generate a %{name} binary package,
-but it does generate a number of subpackages
+but it does generate a number of sub-packages
%package -n spacewalk-html
Summary: HTML document files for Spacewalk
13 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.2.38-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.2.38-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-10-25 20:43 +0000
Tagging package [spacewalk-backend] version [1.2.38-1] in directory [backend/].
Changes since spacewalk-config-1.2.3-1:
Miroslav Suchý (5):
if package is not on disk do not throw TB
623967 - write man page for spacewalk-update-signatures
623964 - add man page for update-packages
623966 - add man page for rhn-entitlement-report
Automatic commit of package [spacewalk-backend] release [1.2.38-1].
---
backend/satellite_tools/rhn-entitlement-report.sgml | 53 +++++++
backend/satellite_tools/spacewalk-update-signatures | 2
backend/satellite_tools/spacewalk-update-signatures.sgml | 73 ++++++++++
backend/satellite_tools/update-packages.sgml | 103 +++++++++++++++
backend/spacewalk-backend.spec | 11 +
rel-eng/packages/spacewalk-backend | 2
6 files changed, 242 insertions(+), 2 deletions(-)
---
13 years, 6 months
backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 1445090e4f44c2380b1e2bf12dbc070e1b677e76
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 25 22:43:48 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.2.38-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index efeba48..cec23a3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.37
+Version: 1.2.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -670,6 +670,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Oct 25 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.38-1
+- 623966 - add man page for rhn-entitlement-report
+- 623964 - add man page for update-packages
+- 623967 - write man page for spacewalk-update-signatures
+- if package is not on disk do not throw TB
+
* Mon Oct 25 2010 Jan Pazdziora 1.2.37-1
- The psycopg2 seems to be handling unicode strings just fine.
- packages_cursor() and _source_packages_cursor() are dead; removing
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ab49fea..40c8710 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.37-1 backend/
+1.2.38-1 backend/
13 years, 6 months