diff options
| author |   Richard Brown <rbrown@gentoo.org> | 2008-02-18 13:58:56 +0000 |
|---|---|---|
| committer | Richard Brown <rbrown@gentoo.org> | 2008-02-18 13:58:56 +0000 |
| commit | e958a97ea4af07febe34a1019b417143030e6693 (patch) | |
| tree | c1f8b59475ac48c859ef9a7c7d7264c8ea8683c2 /sys-apps/paludis/files | |
| parent | alpha/ia64/sparc stable wrt #210331 (diff) | |
| download | gentoo-2-e958a97ea4af07febe34a1019b417143030e6693.tar.gz gentoo-2-e958a97ea4af07febe34a1019b417143030e6693.tar.bz2 gentoo-2-e958a97ea4af07febe34a1019b417143030e6693.zip | |
Include fix for news test failure
(Portage version: 2.1.3.19)
Diffstat (limited to 'sys-apps/paludis/files')
| -rw-r--r-- | sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch index 2da9e1351aa1..43ec3177ffc6 100644 --- a/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch +++ b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch @@ -1,7 +1,7 @@ diff --git a/paludis/util/echo_functions.bash.in b/paludis/util/echo_functions.bash.in Source: written by David Leverton -Upstream: probably by next release -Reason: http://thread.gmane.org/gmane.linux.gentoo.user/194929 +Upstream: yes +Reason: http://thread.gmane.org/gmane.linux.gentoo.user/194929 & news test failures index 3a15a77..9af0cf0 100644 --- a/paludis/util/echo_functions.bash.in +++ b/paludis/util/echo_functions.bash.in @@ -25,3 +25,29 @@ index 3a15a77..9af0cf0 100644 return ${retval} } +diff --git a/hooks/news_TEST b/hooks/news_TEST +index 08d5a07..4b77cf8 100755 +--- a/hooks/news_TEST ++++ b/hooks/news_TEST +@@ -23,8 +23,8 @@ news_none_TEST() + export HOOK=sync_all_post + export PALUDIS_HOME=`pwd`/news_TEST_dir/one + +- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code +- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \ ++ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>/dev/null ; test_return_code ++ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>&1 \ + | grep "No unread news items found" >/dev/null ; test_return_code + } + +@@ -35,8 +35,8 @@ news_one_TEST() + export HOOK=sync_all_post + export PALUDIS_HOME=`pwd`/news_TEST_dir/two + +- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code +- bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \ ++ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>/dev/null ; test_return_code ++ bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>&1 \ + | grep "You have 1 unread news item" >/dev/null ; test_return_code + } + |