aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-11-11 19:04:18 +0000
committerUlrich Müller <ulm@gentoo.org>2010-11-11 19:04:18 +0000
commiteee39cf019785e8d63b074f1d8ddd3079f17b720 (patch)
tree5110ea68adb734996cd98b991f3c0c3ff832ee37
parentUpdate ChangeLog. (diff)
downloadeselect-eee39cf019785e8d63b074f1d8ddd3079f17b720.tar.gz
eselect-eee39cf019785e8d63b074f1d8ddd3079f17b720.tar.bz2
eselect-eee39cf019785e8d63b074f1d8ddd3079f17b720.zip
Sort news items by their name, bug 344655.
svn path=/trunk/; revision=780
-rw-r--r--ChangeLog5
-rw-r--r--NEWS4
-rw-r--r--man/news.eselect.58
-rw-r--r--modules/news.eselect6
4 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8675635..f2840a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-11-11 Ulrich Mueller <ulm@gentoo.org>
+ * modules/news.eselect (find_items): Sort items by their name,
+ i.e. effectively by date. Bug 344655.
+ (do_read): Don't exit the loop if the first read item is met.
+ * man/news.eselect.5: Update.
+
* modules/news.eselect (find_items, write_item_list): Add missing
local variable declaration.
diff --git a/NEWS b/NEWS
index 4387223..b1db56a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
This file contains a summary of changes in released versions. Please read the
ChangeLog file for a more detailed listing of changes/bug fixes.
+trunk:
+ New features:
+ - The news module now sorts the items by their date (bug #344655).
+
1.2.11:
New features:
- New --quiet option in news module.
diff --git a/man/news.eselect.5 b/man/news.eselect.5
index d7df592..347f87f 100644
--- a/man/news.eselect.5
+++ b/man/news.eselect.5
@@ -2,7 +2,7 @@
.\" Distributed under the terms of the GNU General Public License v2
.\" $Id$
.\"
-.TH news.eselect 5 "March 2010" "Gentoo Linux" eselect
+.TH news.eselect 5 "November 2010" "Gentoo Linux" eselect
.SH NAME
news.eselect \- The GLEP 42 newsreader module for Gentoo's eselect
.SH SYNOPSIS
@@ -35,9 +35,9 @@ List all Gentoo news items.
.br
News items:
.br
- [1] unread 2009-04-18 Generation 1 Java Setup Deprecated
- [2] read 2009-04-06 Migration from teTeX to TeXLive
- [3] read 2009-04-06 Migration to X.org Server 1.5
+ [1] read 2009-04-06 Migration from teTeX to TeXLive
+ [2] read 2009-04-06 Migration to X.org Server 1.5
+ [3] unread 2009-04-18 Generation 1 Java Setup Deprecated
.SH ACTION: READ
.B eselect news read
.RB [ \-\-mbox | \-\-quiet | \-\-raw ]
diff --git a/modules/news.eselect b/modules/news.eselect
index 2921e1f..445edbc 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -15,7 +15,7 @@ NEWS_DIR="${EPREFIX}/var/lib/gentoo/news"
# read list of news items
# list of parameters may contain "unread" or "read"
# returns one item per line: status/repository/name
-# sort order: 1. "unread" before "read", 2. by repository
+# sort order: by item name (i.e. effectively by date)
find_items() {
local stat repos=$(get_repositories) repo file item
for stat in "$@"; do
@@ -26,7 +26,7 @@ find_items() {
echo "${stat}/${repo}/${item}"
done
done
- done
+ done | sort -t / -k 3
}
# write list of items to file
@@ -256,7 +256,7 @@ do_read() {
# expand special values "new" and "all"
if [[ $# -eq 0 || $1 = new || $1 = all ]]; then
for (( i = 1; i <= n; i++ )); do
- [[ $1 = all || ${items[i-1]%%/*} = unread ]] || break
+ [[ $1 = all || ${items[i-1]%%/*} = unread ]] || continue
seq="${seq} ${i}"
done
set -- ${seq}