client/rhel
by Michael Mraka
client/rhel/yum-rhn-plugin/rhnplugin.py | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
New commits:
commit 75fe42bbfeba9e5d4411aea1ea8b880c57dc2fb8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 13 16:32:35 2012 +0200
force metadata update if they differ from version on server
fixing situation when
- new package has been pushed to channel on spacewalk thus new repo
metadata have been generated
- package installation has been scheduled from server
- yum on client has older data in cache but they haven't expired yet
so it can't see new package and rhn_check fails with
'Error while executing packages action: empty transaction'
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 228f692..9e2a3bd 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -44,6 +44,7 @@ requires_api_version = '2.5'
plugin_type = TYPE_CORE
pcklAuthFileName = "/var/spool/up2date/loginAuth.pkl"
cachedRHNReposFile = 'rhnplugin.repos'
+versionRHNRepoFile = 'rhnversion'
rhn_enabled = True
@@ -186,6 +187,8 @@ def init_hook(conduit):
repos.add(repo)
if cachefile:
cachefile.write("%s %s\n" % (repo.id, repo.name))
+ if not currentRHNRepoVersion(repo, channel['version']):
+ repo._metadataCurrent = False
if cachefile:
cachefile.close()
@@ -236,6 +239,27 @@ def addCachedRepos(conduit):
if not repos.findRepos(repo.id):
repos.add(repo)
+def currentRHNRepoVersion(repo, repoversion):
+ cachedir = repo.cachedir
+ versionfilename = os.path.join(cachedir, versionRHNRepoFile)
+ last_version = None
+ versionfile = None
+ try:
+ if not os.path.exists(cachedir):
+ os.makedirs(cachedir, 0755)
+ if os.path.exists(versionfilename):
+ versionfile = open(versionfilename, 'r+')
+ last_version = versionfile.readline().strip('\n')
+ versionfile.seek(0,0)
+ else:
+ versionfile = open(versionfilename, 'w')
+ versionfile.write(repoversion + '\n')
+ versionfile.close()
+ except:
+ if versionfile:
+ versionfile.close()
+ return (last_version == repoversion)
+
def posttrans_hook(conduit):
""" Post rpm transaction hook. We update the RHN profile here. """
global rhn_enabled
11 years, 7 months
Changes to 'refs/tags/spacewalk-web-1.8.36-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.8.36-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-20 14:42 +0000
Tagging package [spacewalk-web] version [1.8.36-1] in directory [web/].
Changes since spacewalk-java-1.8.150-1:
Jan Pazdziora (2):
Avoid link without eid parameter filled.
Automatic commit of package [spacewalk-web] release [1.8.36-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 7 months
Changes to 'refs/tags/spacewalk-setup-jabberd-1.8.6-1'
by Jan Pazdziora
Tag 'spacewalk-setup-jabberd-1.8.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-20 14:42 +0000
Tagging package [spacewalk-setup-jabberd] version [1.8.6-1] in directory [spacewalk/spacewalk-setup-jabberd/].
Changes since spacewalk-java-1.8.150-1:
Jan Pazdziora (3):
Avoid link without eid parameter filled.
Automatic commit of package [spacewalk-web] release [1.8.36-1].
Automatic commit of package [spacewalk-setup-jabberd] release [1.8.6-1].
---
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++-
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
5 files changed, 11 insertions(+), 5 deletions(-)
---
11 years, 7 months
2 commits - rel-eng/packages spacewalk/spacewalk-setup-jabberd web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++-
web/spacewalk-web.spec | 5 ++++-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit a7f06f9ad36755f9fa0ca1173e143a8fd1f2d741
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 20 16:42:37 2012 +0200
Automatic commit of package [spacewalk-setup-jabberd] release [1.8.6-1].
diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd
index 2dc326f..1999fc6 100644
--- a/rel-eng/packages/spacewalk-setup-jabberd
+++ b/rel-eng/packages/spacewalk-setup-jabberd
@@ -1 +1 @@
-1.8.5-1 spacewalk/spacewalk-setup-jabberd/
+1.8.6-1 spacewalk/spacewalk-setup-jabberd/
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index a222f4e..34c2b53 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-jabberd
-Version: 1.8.5
+Version: 1.8.6
Release: 1%{?dist}
Summary: Tools to setup jabberd for Spacewalk
Group: Applications/System
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
%{_sysconfdir}/pki/spacewalk
%changelog
+* Thu Sep 20 2012 Jan Pazdziora 1.8.6-1
+- 857284 - don't setup ipv6 if /proc/net/if_inet6 is empty
+
* Mon Aug 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.5-1
- 807479 - correct description
commit d388703e23bd2c29ed7bfbba41e92d53583ae88b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 20 16:42:29 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.36-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 9459a2a..fe0ee39 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.35-1 web/
+1.8.36-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index dd3ba92..7c210b9 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.35
+Version: 1.8.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Sep 20 2012 Jan Pazdziora 1.8.36-1
+- Avoid link without eid parameter filled.
+
* Fri Sep 07 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.35-1
- restore changelog
- changing web.chat_enabled -> java.chat_enabled
11 years, 7 months
web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 19c5c9b25cb906a018eb199341759c3af42c36b5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 20 16:40:05 2012 +0200
Avoid link without eid parameter filled.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index f0b65fa..de23f38 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -1484,7 +1484,7 @@ sub obsoleting_packages_provider {
my $adv_type = $row->{ADVISORY_TYPE};
my $adv_id = $row->{ERRATA_ID};
- $row->{RELATED_ERRATA} = sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv);
+ $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv) : '';
}
return (%ret);
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.150-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.150-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-20 11:39 +0000
Tagging package [spacewalk-java] version [1.8.150-1] in directory [java/].
Changes since spacewalk-java-1.8.149-1:
Jan Pazdziora (2):
Checkstyle fix.
Automatic commit of package [spacewalk-java] release [1.8.150-1].
Stephen Herr (1):
790120 - removing the config elaborator from a few queries where it's not needed
Tomas Lestach (10):
ssm_remote_commandable mode does not need system_monitoring elaborator
systems_with_package_nvr mode does not need system_monitoring elaborator
systems_subscribed_to_channel mode does not need system_monitoring elaborator
systems_in_group mode does not need system_monitoring elaborator
target_systems_for_group mode does not need system_monitoring elaborator
systems_with_needed_package mode does not need system_monitoring elaborator
target_systems_for_channel mode does not need system_monitoring elaborator
visible_to_user_from_sysid_list mode does not need system_monitoring elaborator
system_entitlement_list mode does not need system_monitoring elaborator
affected_by_errata mode does not need system_monitoring elaborator
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 24 ----------
java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java | 2
java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java | 24 ++++++----
java/spacewalk-java.spec | 18 +++++++
rel-eng/packages/spacewalk-java | 2
5 files changed, 35 insertions(+), 35 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 18 +++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit ed1f22ddfdff16509733c962c4aa6c20315fd98b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 20 13:39:33 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.150-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 60878a1..63c8962 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.8.149
+Version: 1.8.150
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,22 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 20 2012 Jan Pazdziora 1.8.150-1
+- Checkstyle fix.
+- 790120 - removing the config elaborator from a few queries where it's not
+ needed
+- affected_by_errata mode does not need system_monitoring elaborator
+- system_entitlement_list mode does not need system_monitoring elaborator
+- visible_to_user_from_sysid_list mode does not need system_monitoring
+ elaborator
+- target_systems_for_channel mode does not need system_monitoring elaborator
+- systems_with_needed_package mode does not need system_monitoring elaborator
+- target_systems_for_group mode does not need system_monitoring elaborator
+- systems_in_group mode does not need system_monitoring elaborator
+- systems_subscribed_to_channel mode does not need system_monitoring elaborator
+- systems_with_package_nvr mode does not need system_monitoring elaborator
+- ssm_remote_commandable mode does not need system_monitoring elaborator
+
* Wed Sep 19 2012 Jan Pazdziora 1.8.149-1
- Convert TIMESTAMP without time zone as well.
- Validate proxy format on general config page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 20170d3..8a3feea 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.149-1 java/
+1.8.150-1 java/
11 years, 7 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java | 2
java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java | 24 ++++++----
2 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit e59a26c7ac2dba4bfb97ec819f234fea5d28a26e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 20 10:19:23 2012 +0200
Checkstyle fix.
Addressing
Starting audit...
/builddir/build/BUILD/spacewalk-java-1.8.149/./code/src/com/redhat/rhn/common/validator/HostPortValidator.java:54:35: Expected @param tag for 'hostPort'.
Audit done.
Starting audit...
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:39: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:40: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:41: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:46: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:47: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:48: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:49: Line is longer than 92 characters.
/builddir/build/BUILD/spacewalk-java-git-1.8187a01/./code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java:61: Line is longer than 92 characters.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java b/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java
index cff8ad7..0210d5b 100644
--- a/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java
+++ b/java/code/src/com/redhat/rhn/common/validator/HostPortValidator.java
@@ -48,7 +48,7 @@ public class HostPortValidator {
/**
* Return true if the given string is a valid host[:port] representation.
- * @param hostPort
+ * @param hostPort the string with host[:port]
* @return true if hostPort represents a valid host and port, else false.
*/
public boolean isValid(String hostPort) {
diff --git a/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java b/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java
index e96bd91..b934ec9 100644
--- a/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java
+++ b/java/code/src/com/redhat/rhn/common/validator/test/HostPortValidatorTest.java
@@ -36,17 +36,24 @@ public class HostPortValidatorTest extends TestCase {
}
public void testIPv6() {
- assertTrue(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344"));
- assertTrue(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]"));
- assertTrue(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
+ assertTrue(HostPortValidator.getInstance().isValid(
+ "2001:0db8:85a3:08d3:1319:8a2e:0370:7344"));
+ assertTrue(HostPortValidator.getInstance().isValid(
+ "[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]"));
+ assertTrue(HostPortValidator.getInstance().isValid(
+ "[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
assertTrue(HostPortValidator.getInstance().isValid("[2607:f0d0:1002:51::4]:8888"));
assertTrue(HostPortValidator.getInstance().isValid("[::1]"));
assertTrue(HostPortValidator.getInstance().isValid("[::1]:8888"));
- assertFalse(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
- assertFalse(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]]:8888"));
- assertFalse(HostPortValidator.getInstance().isValid("[2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
- assertFalse(HostPortValidator.getInstance().isValid("2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid(
+ "2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid(
+ "[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]]:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid(
+ "[2001:0db8:85a3:08d3:1319:8a2e:0370:7344:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid(
+ "2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:8888"));
assertFalse(HostPortValidator.getInstance().isValid("[::1]:"));
assertFalse(HostPortValidator.getInstance().isValid("[]"));
}
@@ -58,6 +65,7 @@ public class HostPortValidatorTest extends TestCase {
assertTrue(HostPortValidator.getInstance().isValid("proxy.example.com:8888"));
assertFalse(HostPortValidator.getInstance().isValid("http://proxy.example.com"));
- assertFalse(HostPortValidator.getInstance().isValid("http://proxy.example.com:8888"));
+ assertFalse(HostPortValidator.getInstance().isValid(
+ "http://proxy.example.com:8888"));
}
}
11 years, 7 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 13 ----------
1 file changed, 13 deletions(-)
New commits:
commit 0578253e95c488928e5d486e665eead2a7aaf034
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 19 15:06:55 2012 -0400
790120 - removing the config elaborator from a few queries where it's not needed
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 a8de219..9914d3e 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
@@ -37,7 +37,6 @@ select * from (
ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="find_by_name" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -52,7 +51,6 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
and S.name = :name
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
@@ -72,7 +70,6 @@ SELECT S.id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
</mode>
@@ -101,7 +98,6 @@ SELECT DISTINCT S.id,
ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="custom_vals">
@@ -215,7 +211,6 @@ SELECT S.id as id,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="count_systems_subscribed_to_channel">
@@ -259,7 +254,6 @@ SELECT
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements"/>
</mode>
@@ -350,7 +344,6 @@ SELECT SGM.server_id AS ID, S.name AS NAME,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements"/>
</mode>
@@ -368,7 +361,6 @@ SELECT S.id, S.name,
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements"/>
</mode>
@@ -386,7 +378,6 @@ SELECT S.id, S.name
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="systems_with_needed_package" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -400,7 +391,6 @@ SELECT S.ID
ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
</mode>
<mode name="target_systems_for_channel" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -419,7 +409,6 @@ SELECT ES.id, S.name, 1 as selectable
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = ES.id)
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements"/>
</mode>
@@ -581,7 +570,6 @@ where a.user_id = :formvar_uid
ORDER BY UPPER(COALESCE(S.name, '(none)')), S.id
</query>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements" />
</mode>
@@ -636,7 +624,6 @@ SELECT SA.server_id as id,
WHERE errata_id = :eid)
</elaborator>
<elaborator name="system_overview" />
- <elaborator name="system_config_files_with_diffs" />
<elaborator name="entitlements" />
</mode>
11 years, 7 months
10 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 11 ----------
1 file changed, 11 deletions(-)
New commits:
commit b5b2b63f8d1f2bfef28c6f6d6dde0f91cd65414c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 16:56:17 2012 +0200
affected_by_errata mode does not need system_monitoring elaborator
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 3b37253..a8de219 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
@@ -637,7 +637,6 @@ SELECT SA.server_id as id,
</elaborator>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
commit 5cf8876ef4823faae80ffe1cdf1ae0a350c90246
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 16:50:48 2012 +0200
system_entitlement_list mode does not need system_monitoring elaborator
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 f21f239..3b37253 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
@@ -582,7 +582,6 @@ where a.user_id = :formvar_uid
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements" />
</mode>
commit 65987fd481423a1548b02e5e870b3ba3d2cdb13a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 16:34:02 2012 +0200
visible_to_user_from_sysid_list mode does not need system_monitoring elaborator
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 69e7e8b..f21f239 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
@@ -474,7 +474,6 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<query name="available_to_user_from_sysid_list" />
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
<elaborator name="is_virtual_guest" />
<elaborator name="is_virtual_host" />
commit 8ab168a70813c0d6fc19ce5c1153535f883b449c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 16:26:40 2012 +0200
target_systems_for_channel mode does not need system_monitoring elaborator
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 08aeeaa..69e7e8b 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
@@ -420,7 +420,6 @@ SELECT ES.id, S.name, 1 as selectable
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
commit 1c5244f902d7b32c1b7097820f03890d810a3e33
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 16:23:08 2012 +0200
systems_with_needed_package mode does not need system_monitoring elaborator
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 90a8397..08aeeaa 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
@@ -387,7 +387,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
</mode>
<mode name="systems_with_needed_package" class="com.redhat.rhn.frontend.dto.SystemOverview">
@@ -402,7 +401,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
</mode>
<mode name="target_systems_for_channel" class="com.redhat.rhn.frontend.dto.SystemOverview">
commit 95ec10dde482624ac71754c5383c5c1b5eac5aae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 14:52:13 2012 +0200
target_systems_for_group mode does not need system_monitoring elaborator
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 2787d08..90a8397 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
@@ -369,7 +369,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
commit 1b42e9eef543e2bd0b35b88721e9bce43f6efa0d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 14:48:37 2012 +0200
systems_in_group mode does not need system_monitoring elaborator
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 495d14a..2787d08 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
@@ -351,7 +351,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
commit f1c4738d6ed9b844432fbec92198d059787b64ad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 14:38:15 2012 +0200
systems_subscribed_to_channel mode does not need system_monitoring elaborator
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 6bb4d2d..495d14a 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
@@ -260,7 +260,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
<elaborator name="entitlements"/>
</mode>
commit 84e4431743e5592eae6bb64ab73fc525f846b1f3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 13:43:11 2012 +0200
systems_with_package_nvr mode does not need system_monitoring elaborator
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 182a6f5..6bb4d2d 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
@@ -216,7 +216,6 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
</mode>
<mode name="count_systems_subscribed_to_channel">
commit 39e1385798a53a95ade649a2f0272d39cfc97abc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 19 13:41:59 2012 +0200
ssm_remote_commandable mode does not need system_monitoring elaborator
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 c3d8c2d..182a6f5 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
@@ -102,7 +102,6 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />
<elaborator name="system_config_files_with_diffs" />
- <elaborator name="system_monitoring" />
</mode>
<mode name="custom_vals">
11 years, 7 months