web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a570dff3c34fac655c86f10c48f56f3cfbc5a9cd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 24 13:59:32 2011 +0100
Fixing previous taggable_systems_in_set fix (Oracle, this time).
Addressing
ORA-00904: "S"."NAME": invalid identifier (DBD ERROR: error possibly near <*> indicator at char 500 in
[...]
ORDER BY UPPER(coalesce(<*>S.NAME, '(none)')), S.ID
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index 911ac83..4400d10 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -132,7 +132,7 @@ SELECT DISTINCT S.id,
AND USP.server_id = SS.server_id
AND USP.server_id = S.id
) S
-ORDER BY UPPER(coalesce(S.NAME, '(none)')), S.ID
+ORDER BY UPPER(coalesce(S.SERVER_NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
</mode>
13 years
4 commits - branding/styles branding/templates client/tools java/code web/html
by Miroslav Suchý
branding/styles/navbar_top.txt | 2 +-
branding/styles/navbar_top_sat.txt | 4 ++--
branding/templates/footer.pxt | 2 +-
client/tools/rhncfg/config_common/file_utils.py | 6 ++++--
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 +-
java/code/webapp/WEB-INF/includes/header.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 2 +-
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 +-
web/html/errors/403.html | 4 ++--
web/html/errors/404.html | 4 ++--
web/html/errors/413.html | 4 ++--
web/html/errors/500.html | 4 ++--
14 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit ab80c2974e4fa2261478bed2c6d8a99703671b4c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 24 12:20:27 2011 +0100
688461 - try/except is workaround of BZ 690238
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 7d34884..634faa2 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -97,9 +97,11 @@ class FileProcessor:
sectx_result = ''
result = ''
- if is_selinux_enabled():
+ try:
cur_sectx = lgetfilecon(path)[1]
- else:
+ except OSError: # workarounding BZ 690238
+ cur_sectx = None
+ if not is_selinux_enabled():
cur_sectx = None
if cur_sectx == None:
commit 4e882f23e446121439354b18ac11d01aa329111a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 23 22:10:21 2011 +0100
automatically set focus on filter input field
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index 62df957..317ccf3 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -683,7 +683,7 @@ public class ListTagUtil {
if (filterValue != null) {
ListTagUtil.write(pageContext, filterValue);
}
- ListTagUtil.write(pageContext, "\" />");
+ ListTagUtil.write(pageContext, "\" autofocus/>");
ListTagUtil.write(pageContext, IE_MAGIC_SNIPPET);
ListTagUtil.write(pageContext,
commit e588d714cb89b90a83e2fe8a2ddd24513b199f6e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 23 22:00:32 2011 +0100
update copyright years
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt
index 553a49a..34dce1e 100644
--- a/branding/templates/footer.pxt
+++ b/branding/templates/footer.pxt
@@ -4,7 +4,7 @@
<pxt-use class="Sniglets::Utils" />
<pxt-use class="Sniglets::Users" />
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
<div style="color: black">
Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a>
</div>
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index 87fd4b4..fb8580c 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -127,7 +127,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index 2302c25..146b25b 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -114,7 +114,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 4204bd6..db9eeb8 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -122,7 +122,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index da0b828..87e8a0c 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -120,7 +120,7 @@
</tbody></table>
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
</div>
</div> <!-- close content -->
commit d434d0a71ef0c1da7cb6363f45d1da5a1959052d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 23 21:58:46 2011 +0100
implement common access keys
see http://en.wikipedia.org/wiki/Access_key
diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt
index 14d4a77..8512803 100644
--- a/branding/styles/navbar_top.txt
+++ b/branding/styles/navbar_top.txt
@@ -38,7 +38,7 @@ class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
</select><input type="text" name="search_string" maxlength="40"
-size="20" />
+size="20" accesskey="4"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search"
diff --git a/branding/styles/navbar_top_sat.txt b/branding/styles/navbar_top_sat.txt
index 1ee2c25..c6c6fe3 100644
--- a/branding/styles/navbar_top_sat.txt
+++ b/branding/styles/navbar_top_sat.txt
@@ -7,7 +7,7 @@
<div id="utilityLinks">
<p id="linx"><span class="hide"><strong>Shortcuts:</strong> </span><a
href="http://kbase.redhat.com/">Knowledgebase</a> <span
-class="navPipe">|</span> <a href="/help">Documentation</a></p>
+class="navPipe">|</span> <a href="/help" accesskey="6">Documentation</a></p>
</div>
<div id="utilityAccount">
<rhn-display-login>
@@ -38,7 +38,7 @@ class="navPipe">|</span><a href="/rhn/Logout.do"><span>Sign Out</span></a>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
</select><input type="text" name="search_string" maxlength="40"
-size="20" />
+size="20" accesskey="4"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search"
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt
index ba15734..553a49a 100644
--- a/branding/templates/footer.pxt
+++ b/branding/templates/footer.pxt
@@ -4,7 +4,7 @@
<pxt-use class="Sniglets::Utils" />
<pxt-use class="Sniglets::Users" />
<div id="footer">
- Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
+ Copyright © 2002-10 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a>
<div style="color: black">
Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index a714d9e..8cac47c 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -23,7 +23,7 @@
<div id="header">
<a href="<bean:message key="layout.jsp.vendor.website"/>" title="<bean:message key="layout.jsp.vendor.title"/>"><img src="/img/logo_vendor.png" alt="<bean:message key="layout.jsp.vendor.name"/>" id="rhLogo" /></a>
<a href="/" title="<bean:message key="layout.jsp.productname"/> homepage">
- <img src="/img/logo_product.png" alt="<bean:message key="layout.jsp.productname"/>" id="rhnLogo" />
+ <img src="/img/logo_product.png" alt="<bean:message key="layout.jsp.productname"/>" id="rhnLogo" accesskey="2"/>
</a>
<rhn:require acl="user_authenticated()">
<div id="searchbar">
@@ -36,7 +36,7 @@
<option value="packages"><bean:message key="header.jsp.packages"/></option>
<option value="errata"><bean:message key="header.jsp.errata"/></option>
<option value="docs"><bean:message key="header.jsp.documentation"/></option>
- </select><input type="text" name="search_string" maxlength="40" size="20" />
+ </select><input type="text" name="search_string" maxlength="40" size="20" accesskey="4"/>
<input type="hidden" name="submitted" value="true"/>
<input type="submit" class="button" name="image-1" value="Search" align="top" /></form>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 35987ca..13b9c82 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -28,7 +28,7 @@
<table class="details">
<tr><th><bean:message key="packagesearch.jsp.searchfor"/></th>
<td>
- <html:text property="search_string" name="search_string" value="${search_string}" />
+ <html:text property="search_string" name="search_string" value="${search_string}" accesskey="4"/>
<html:submit>
<bean:message key="button.search" />
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index b8fbdd8..9a4ee69 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -45,7 +45,7 @@
<tr><th><bean:message key="erratasearch.jsp.searchfor"/></th>
<td>
<html:text property="search_string" name="search_string"
- value="${search_string}" maxlength="36" />
+ value="${search_string}" maxlength="36" accesskey="4"/>
<html:submit>
<bean:message key="button.search" />
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 7765160..2a1119a 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -28,7 +28,7 @@
<table class="details">
<tr><th><bean:message key="docsearch.jsp.searchfor"/></th>
<td>
- <html:text property="search_string" name="search_string" value="${search_string}" />
+ <html:text property="search_string" name="search_string" value="${search_string}" accesskey="4"/>
<html:submit>
<bean:message key="button.search" />
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index 9049d14..ea66d14 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -23,7 +23,7 @@
<tr><th><label for="searchfor"><bean:message key="erratasearch.jsp.searchfor"/></label></th>
<td>
<html:text property="search_string" name="search_string" styleId="searchfor"
- value="${search_string}" maxlength="36" />
+ value="${search_string}" maxlength="36" accesskey="4"/>
<html:submit>
<bean:message key="button.search" />
</html:submit>
diff --git a/web/html/errors/403.html b/web/html/errors/403.html
index b7bb8a0..87fd4b4 100644
--- a/web/html/errors/403.html
+++ b/web/html/errors/403.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text">
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/404.html b/web/html/errors/404.html
index bb773a3..2302c25 100644
--- a/web/html/errors/404.html
+++ b/web/html/errors/404.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text">
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/413.html b/web/html/errors/413.html
index 89bcb0f..4204bd6 100644
--- a/web/html/errors/413.html
+++ b/web/html/errors/413.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text">
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
diff --git a/web/html/errors/500.html b/web/html/errors/500.html
index ad4e190..da0b828 100644
--- a/web/html/errors/500.html
+++ b/web/html/errors/500.html
@@ -40,7 +40,7 @@
<option value="packages">Packages</option>
<option value="errata">Errata</option>
<option value="docs">Documentation</option>
- </select><input name="search_string" maxlength="40" size="20" type="text">
+ </select><input name="search_string" maxlength="40" size="20" type="text" accesskey="4">
<input name="submitted" value="true" type="hidden">
<input class="button" name="image-1" value="Search" type="submit" align="top"></form>
13 years
Changes to 'refs/tags/spacewalk-utils-1.4.3-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.4.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-03-24 09:50 +0000
Tagging package [spacewalk-utils] version [1.4.3-1] in directory [utils/].
Changes since spacewalk-web-1.4.14-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-utils] release [1.4.3-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages utils/spacewalk-utils.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d0e43365c531697431b2b02ff48d64fbf65bd62e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 24 10:50:07 2011 +0100
Automatic commit of package [spacewalk-utils] release [1.4.3-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 8a09831..6bc9f11 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.4.2-1 utils/
+1.4.3-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 0890e06..e3885b8 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.4.2
+Version: 1.4.3
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 24 2011 Jan Pazdziora 1.4.3-1
+- In spacewalk-dump-schema, use the default Oracle connect information from
+ config file.
+
* Thu Mar 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.2-1
- made spacewalk-hostname-rename working on postgresql
13 years
Changes to 'refs/tags/spacewalk-web-1.4.14-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.4.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-03-24 09:49 +0000
Tagging package [spacewalk-web] version [1.4.14-1] in directory [web/].
Changes since yum-rhn-plugin-1.4.6-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.4.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a34bcc61c2739d652c9b5f09dd9383801c158d4b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 24 10:49:28 2011 +0100
Automatic commit of package [spacewalk-web] release [1.4.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index f396567..ccfff1a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.4.13-1 web/
+1.4.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ae78e72..c096ffb 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: 1.4.13
+Version: 1.4.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Mar 24 2011 Jan Pazdziora 1.4.14-1
+- As PostgreSQL does not support table aliases in updates, remove them.
+
* Tue Mar 22 2011 Jan Pazdziora 1.4.13-1
- Moving the Requires: httpd from sniglets to base-minimal, dobby, and pxt
which actually have %files with apache group in them.
13 years
Changes to 'refs/tags/yum-rhn-plugin-1.4.6-1'
by Michael Mraka
Tag 'yum-rhn-plugin-1.4.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-24 09:29 +0000
Tagging package [yum-rhn-plugin] version [1.4.6-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since yum-rhn-plugin-1.4.5-1:
Jan Pazdziora (2):
As PostgreSQL does not support table aliases in updates, remove them.
In spacewalk-dump-schema, use the default Oracle connect information from config file.
Justin Sherrill (1):
string does not exist, str is the correct thing to use here...
Michael Mraka (2):
688870 - also check whether cached repo is valid
Automatic commit of package [yum-rhn-plugin] release [1.4.6-1].
---
client/rhel/rhnlib/rhn/rpclib.py | 6 +++---
client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
utils/spacewalk-dump-schema | 18 ++++++++++++++----
web/modules/rhn/RHN/DB/JoinClass.pm | 5 +++--
6 files changed, 27 insertions(+), 12 deletions(-)
---
13 years
client/rhel rel-eng/packages
by Michael Mraka
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f32498198edd0a4fc259a9f919bba11aaf9f8d2b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 24 10:29:17 2011 +0100
Automatic commit of package [yum-rhn-plugin] release [1.4.6-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 5183e7b..4972970 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.4.5
+Version: 1.4.6
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,9 @@ fi
%doc LICENSE
%changelog
+* Thu Mar 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.6-1
+- 688870 - also check whether cached repo is valid
+
* Wed Mar 23 2011 Jan Pazdziora 1.4.5-1
- remove every reference to "up2date --register" - even in comments
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 8c5ba32..607bd02 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.4.5-1 client/rhel/yum-rhn-plugin/
+1.4.6-1 client/rhel/yum-rhn-plugin/
13 years
client/rhel
by Michael Mraka
client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 44955186189e3a60afa07e6e4d1b5c9710b2e61c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 24 10:25:41 2011 +0100
688870 - also check whether cached repo is valid
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 4f2f308..4fd6de7 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -65,7 +65,8 @@ def init_hook(conduit):
cachefile.close()
for (repoid, reponame) in repolist:
repodir = os.path.join(cachedir, repoid)
- if os.path.isdir(repodir):
+ if os.path.isdir(repodir) and os.path.isfile(
+ os.path.join(repodir, 'repodata', 'repomd.xml')):
repo = YumRepository(repoid)
repo.basecachedir = cachedir
repo.baseurl = ['file:///' + repodir ]
13 years
utils/spacewalk-dump-schema
by Jan Pazdziora
utils/spacewalk-dump-schema | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 05e56ed9da760c66ba2bedfbc6b2479f881546de
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 24 09:25:38 2011 +0100
In spacewalk-dump-schema, use the default Oracle connect information from config file.
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index 55cb220..6877635 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -3,13 +3,22 @@
use strict;
use warnings FATAL => 'all';
+use Spacewalk::Setup ();
use Getopt::Long ();
use DBI ();
+my $config_file = Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION;
+my %options;
+Spacewalk::Setup::read_config($config_file, \%options);
+
+if ($options{db_backend} ne 'oracle') {
+ die "The $0 is can only dump Oracle database schema.\n";
+}
+
my ($db, $user, $password);
sub usage {
- print "$0: --db=SID --user=USERNAME --password=PASSWORD [ --help ]\n";
+ print "$0: [--db=SID --user=USERNAME --password=PASSWORD] [ --help ]\n";
if ($@) {
exit shift;
}
@@ -23,12 +32,13 @@ Getopt::Long::GetOptions (
'help' => \&usage,
) or exit 1;
-if (grep { not defined $_ } $db, $user, $password) {
- usage(2);
+if (grep { defined $_ } $db, $user, $password) {
+ # Some connect parameter was specified, let's use it as new connect info
+ @options{qw( db_name db_user db_password )} = ( $db, $user, $password );
}
$ENV{NLS_LANG} = 'AMERICAN_AMERICA.UTF8';
-my $dbh = DBI->connect("dbi:Oracle:$db", $user, $password, {
+my $dbh = DBI->connect("dbi:Oracle:$options{db_name}", $options{db_user}, $options{db_password}, {
RaiseError => 1,
FetchHashKeyName => 'NAME_lc',
LongReadLen => 10_000_000,
13 years