java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 rel-eng/packages/tito | 2 spec-tree/tito/0001-fixed-building-third-party-packages.patch | 52 ++++++++++ spec-tree/tito/tito.spec | 4 web/html/network/systems/ssm/errata/index.pxt | 44 -------- web/html/network/systems/ssm/errata/systems_affected.pxt | 42 -------- web/include/nav/ssm.xml | 8 - web/modules/sniglets/Sniglets/ServerActions.pm | 2 17 files changed, 78 insertions(+), 116 deletions(-)
New commits: commit f77047c524ad59bb054d10957d11b440434f1f6f Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 16:54:09 2013 +0100
Automatic commit of package [tito] minor release [0.4.18-1.4].
diff --git a/rel-eng/packages/tito b/rel-eng/packages/tito index b7ceac7..ca881bd 100644 --- a/rel-eng/packages/tito +++ b/rel-eng/packages/tito @@ -1 +1 @@ -0.4.18-1.3 spec-tree/tito/ +0.4.18-1.4 spec-tree/tito/ diff --git a/spec-tree/tito/tito.spec b/spec-tree/tito/tito.spec index ccabd9a..295eccf 100644 --- a/spec-tree/tito/tito.spec +++ b/spec-tree/tito/tito.spec @@ -2,7 +2,7 @@
Name: tito Version: 0.4.18 -Release: 1.3%{?dist} +Release: 1.4%{?dist} Summary: A tool for managing rpm based git projects
Group: Development/Tools @@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog -* Mon Dec 16 2013 Michael Mraka michael.mraka@redhat.com 0.4.18-1.3 +* Mon Dec 16 2013 Michael Mraka michael.mraka@redhat.com 0.4.18-1.4 - fixed building third party packages
* Thu Nov 28 2013 Michael Mraka michael.mraka@redhat.com 0.4.18-1.2
commit 6325e96f75375902faaa504bbbb1f1f8bdcf1680 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 10:52:08 2013 +0100
fixed building third party packages
diff --git a/spec-tree/tito/0001-fixed-building-third-party-packages.patch b/spec-tree/tito/0001-fixed-building-third-party-packages.patch new file mode 100644 index 0000000..00eb86e --- /dev/null +++ b/spec-tree/tito/0001-fixed-building-third-party-packages.patch @@ -0,0 +1,52 @@ +From 01b9c0b0010a78c0ed203449eacfe44c1d229ba6 Mon Sep 17 00:00:00 2001 +From: Michael Mraka michael.mraka@redhat.com +Date: Mon, 16 Dec 2013 10:41:42 +0100 +Subject: [PATCH] fixed building third party packages + +do not try to upload files which are not on the disk but in look-aside cache + +fixing +Error running command: rhpkg new-sources /var/tmp/rpmbuild-cobbler-e8869ff6bebf4ac2f981405ebf4c52c9e993db8fDkxF2Y/SOURCES/cobbler-2.0.7/cobbler-2.0.7.tar.gz +Status code: 256 +Command output: Could not execute new_sources: Path does not exist or is not a file: /var/tmp/rpmbuild-cobbler-e8869ff6bebf4ac2f981405ebf4c52c9e993db8fDkxF2Y/SOURCES/cobbler-2.0.7/cobbler-2.0.7.tar.gz +Traceback (most recent call last): + File "/usr/bin/tito", line 23, in <module> + CLI().main(sys.argv[1:]) + File "/usr/lib/python2.6/site-packages/tito/cli.py", line 94, in main + return module.main(argv) + File "/usr/lib/python2.6/site-packages/tito/cli.py", line 639, in main + scratch=self.options.scratch) + File "/usr/lib/python2.6/site-packages/tito/release.py", line 490, in release + self._git_release() + File "/usr/lib/python2.6/site-packages/tito/release.py", line 512, in _git_release + self._git_upload_sources(project_checkout) + File "/usr/lib/python2.6/site-packages/tito/release.py", line 685, in _git_upload_sources + output = run_command(cmd) + File "/usr/lib/python2.6/site-packages/tito/common.py", line 228, in run_command + raise RunCommandException("Error running command", command, status, output) +tito.exception.RunCommandException: Error running command +--- + src/tito/builder.py | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/tito/builder.py b/src/tito/builder.py +index 4442028..ac47a12 100644 +--- a/src/tito/builder.py ++++ b/src/tito/builder.py +@@ -487,9 +487,11 @@ class NoTgzBuilder(Builder): + self.ran_tgz = True + + debug("Scanning for sources.") +- cmd = "/usr/bin/spectool --list-files '%s' | awk '{print $2}' |xargs -l1 --no-run-if-empty basename " % self.spec_file ++ cmd = "/usr/bin/spectool --list-files --sources '%s' | awk '{print $2}' |xargs -l1 --no-run-if-empty basename " % self.spec_file + result = run_command(cmd) +- self.sources = map(lambda x: os.path.join(self.rpmbuild_gitcopy, x), result.split("\n")) ++ self.sources = [os.path.join(self.rpmbuild_gitcopy, x) ++ for x in result.split("\n") ++ if os.path.exists(os.path.join(self.rpmbuild_gitcopy, x))] + debug(" Sources: %s" % self.sources) + + def _get_rpmbuild_dir_options(self): +-- +1.7.1 +
commit 5e613b298e2c903298843f28e3e16ec2095dd3f6 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 16:52:18 2013 +0100
removed unused ssm errata pxt pages
diff --git a/web/html/network/systems/ssm/errata/index.pxt b/web/html/network/systems/ssm/errata/index.pxt deleted file mode 100644 index 47847b3..0000000 --- a/web/html/network/systems/ssm/errata/index.pxt +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::Lists" /> - <pxt-use class="Sniglets::HTML" /> - - <grail-canvas-replacement mode="legend_canvas"> - <rhn-list-legend type="errata" file="/network/components/legends/errata-list-legend.pxi" /> - </grail-canvas-replacement> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - - <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> - - <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - - <h2>Relevant Errata List</h2> - - <div class="page-summary"> - <p>The errata below apply to one or more of your selected systems.</p> - </div> - -<rhn-listview class="Sniglets::ListView::ErrataList" mode="relevant_to_system_set"> - <set name="errata applicable to systems in set" label="errata_list" /> - - <formvars> - <var name="set_label" type="literal">errata_list</var> - </formvars> - - <column name="Type" label="advisory_icon" width="5%" align="center"/> - <column name="Advisory" label="advisory_name"> - <url>/rhn/errata/details/Details.do?eid={column:id}</url> - </column> - <column name="Synopsis" label="advisory_synopsis" align="left" /> - <column name="Systems" label="affected_system_count" align="center"> - <url>/network/systems/ssm/errata/systems_affected.pxt?eid={column:id}</url> - </column> - <column name="Updated" label="advisory_last_updated" align="center" /> - <action name="Apply Errata" label="apply" url="/network/systems/ssm/errata/apply_errata_conf.pxt" /> -</rhn-listview> - - </grail-canvas-template> - -</pxt-passthrough> diff --git a/web/html/network/systems/ssm/errata/systems_affected.pxt b/web/html/network/systems/ssm/errata/systems_affected.pxt deleted file mode 100644 index fd85c75..0000000 --- a/web/html/network/systems/ssm/errata/systems_affected.pxt +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> -<pxt-use class="Grail::Frame" /> -<pxt-use class="Sniglets::Users" /> -<pxt-use class="Sniglets::Errata" /> -<pxt-use class="Sniglets::Lists" /> -<pxt-use class="Sniglets::HTML" /> - -<grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - - <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> - - <rhn-navi-nav prefix="system_set_manager" depth="0" - file="/nav/ssm.xml" style="contentnav" /> - - -<rhn-errata-details> -<h2><rhn-icon type="header-system"/> -Selected systems affected by {errata_advisory_name}</h2> -</rhn-errata-details> - -<rhn-listview class="Sniglets::ListView::SystemList" mode="in_set_and_affected_by_errata"> - <formvars> - <var name="eid" /> - </formvars> - <column name="Errata" label="total_errata" align="center"> - <url>/rhn/systems/details/ErrataList.do?sid={column:id}</url> - </column> - - <column name="Packages" label="outdated_packages" align="center"> - <url>/rhn/systems/details/packages/UpgradableList.do?sid={column:id}</url> - </column> - - <column name="System" label="server_name" width="50%" align="left"> - <url>/rhn/systems/details/Overview.do?sid={column:id}</url> - </column> - <column name="Base Channel" label="channel_labels" align="left" /> - <column name="Entitlement" label="entitlement_level" /> -</rhn-listview> - - </grail-canvas-template> -</pxt-passthrough>
commit c80897333d8f5b74ddd216a72daebf89a4f97809 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 16:39:54 2013 +0100
fixing references to SSM errata page
it's been ported to java in d2343168a2fa34346c3bfa7a2812cf407e39d8ec
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index dd00b6d..a329e12 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -5055,8 +5055,8 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</ <target>Errata</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Errata-Aktualisierungen einplanen</a>, die relevant für die ausgewählten Systeme sind</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Errata-Aktualisierungen einplanen</a>, die relevant für die ausgewählten Systeme sind</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index bc9f1f9..33e214e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -5054,8 +5054,8 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta <target>Erratas</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Programar actualización de erratas</a> relevantes a sistemas seleccionados</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Programar actualización de erratas</a> relevantes a sistemas seleccionados</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index e82ea7e..acd0eec 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -5055,8 +5055,8 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta <target>Errata</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Planifier les mises à jour d'errata</a> correspondant aux systèmes sélectionnés.</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Planifier les mises à jour d'errata</a> correspondant aux systèmes sélectionnés.</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 15351de..6ef9427 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -5054,8 +5054,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Errata</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Programma gli errata update</a> rilevanti ai sistemi selezionati</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Programma gli errata update</a> rilevanti ai sistemi selezionati</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 9cfa328..b33f579 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -5056,8 +5056,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>エラータ</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target>選択しているシステムに関連した <a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">エラータの更新をスケジュール</a> します </target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target>選択しているシステムに関連した <a href="/rhn/systems/ssm/ListPatches.do">エラータの更新をスケジュール</a> します </target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 18be1d7..a506314 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -5053,8 +5053,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>에라타 </target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target>선택한 시스템에 관련된 <a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">에라타 업데이트 스케줄</a></target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target>선택한 시스템에 관련된 <a href="/rhn/systems/ssm/ListPatches.do">에라타 업데이트 스케줄</a></target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index f3986b2..369e88b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -5052,8 +5052,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Errata</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Agendar atualizações de errata</a>referente ao sistema selecionado</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Agendar atualizações de errata</a>referente ao sistema selecionado</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 9687212..b8d4578 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -5051,8 +5051,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>Исправления</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Настройка установки исправлений</a> в выбранных системах.</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">Настройка установки исправлений</a> в выбранных системах.</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 1111727..bd71e62 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -5054,8 +5054,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>勘误</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">调度勘误更新</a>,这些勘误与所选系统相关。</target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target><a href="/rhn/systems/ssm/ListPatches.do">调度勘误更新</a>,这些勘误与所选系统相关。</target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index f8e4367..fc7b64d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -5051,8 +5051,8 @@ value for this entitlement, excluding the default organization's consumption.</s <target>勘誤</target> </trans-unit> <trans-unit id="ssm.overview.errata.schedule"> - <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source> - <target>為與已選擇之系統相關的勘誤更新<a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">進行排程</a></target> + <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source> + <target>為與已選擇之系統相關的勘誤更新<a href="/rhn/systems/ssm/ListPatches.do">進行排程</a></target> </trans-unit> <trans-unit id="ssm.overview.packages"> <source>Packages</source> diff --git a/web/include/nav/ssm.xml b/web/include/nav/ssm.xml index 2ed0a6c..ddfcd7d 100644 --- a/web/include/nav/ssm.xml +++ b/web/include/nav/ssm.xml @@ -5,12 +5,8 @@ <rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url> </rhn-tab>
- <rhn-tab name="Errata" - on-click="Sniglets::Lists->navi_empty_set" - node-id="system_errata_list"> - <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url> + <rhn-tab name="Errata"> + <rhn-tab-url>/rhn/systems/ssm/ListPatches.do</rhn-tab-url> </rhn-tab>
<rhn-tab name="Packages"> diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm index 41c31ff..ee358b6 100644 --- a/web/modules/sniglets/Sniglets/ServerActions.pm +++ b/web/modules/sniglets/Sniglets/ServerActions.pm @@ -334,7 +334,7 @@ sub server_set_errata_set_actions_cb {
$pxt->push_message(site_info => "Errata updates scheduled.");
- $pxt->redirect('/network/systems/ssm/errata/index.pxt'); + $pxt->redirect('/rhn/systems/ssm/ListPatches.do'); }