From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QH8hz-00017u-1B for garchives@archives.gentoo.org; Tue, 03 May 2011 06:03:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A88F1C071; Tue, 3 May 2011 06:03:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3C0451C071 for ; Tue, 3 May 2011 06:03:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68C441B400D for ; Tue, 3 May 2011 06:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AB0F680505 for ; Tue, 3 May 2011 06:03:31 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: scripts/test-data/, scripts/ X-VCS-Repository: proj/gnome X-VCS-Files: scripts/gen_archlist.py scripts/test-data/gnome-list scripts/test-data/gnome2-list X-VCS-Directories: scripts/test-data/ scripts/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: e712fb7ce2e440079074c6311fdbdae762a9a36a Date: Tue, 3 May 2011 06:03:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 865efbce3f2a0cbc9943d228d07f7cd4 commit: e712fb7ce2e440079074c6311fdbdae762a9a36a Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue May 3 06:03:20 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue May 3 06:03:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De712fb7c gen_archlist.py, test-data: misc fixes --- scripts/gen_archlist.py | 5 ++- scripts/test-data/gnome-list | 1 + scripts/test-data/{gnome-list =3D> gnome2-list} | 32 +++++++++++++----= ------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/scripts/gen_archlist.py b/scripts/gen_archlist.py index 5d9dee5..e53f9cc 100755 --- a/scripts/gen_archlist.py +++ b/scripts/gen_archlist.py @@ -439,10 +439,11 @@ if __name__ =3D=3D "__main__": raise Exception('Inline comments are not supported') if not portage.catpkgsplit(cpv): # It's actually a cp - cpv =3D match_wanted_atoms(cpv, release=3DNEW_REL)[0] - if not cpv: + cpv =3D match_wanted_atoms(cpv, release=3DNEW_REL) + if not cpv or not cpv[0]: debug('%s: Invalid cpv' % cpv) continue + cpv =3D cpv[0] kws_missing =3D max_kws(cpv, release=3DOLD_REL) if kws_missing =3D=3D []: # Current cpv has the max keywords =3D> nothing to do diff --git a/scripts/test-data/gnome-list b/scripts/test-data/gnome-list index a579522..4b7bbf1 100644 --- a/scripts/test-data/gnome-list +++ b/scripts/test-data/gnome-list @@ -9,6 +9,7 @@ gnome-base/gnome-desktop gnome-base/librsvg media-libs/libcanberra net-libs/libsoup +net-libs/libsoup-gnome x11-libs/libwnck x11-libs/libxklavier dev-libs/atk diff --git a/scripts/test-data/gnome-list b/scripts/test-data/gnome2-list similarity index 88% copy from scripts/test-data/gnome-list copy to scripts/test-data/gnome2-list index a579522..f096bdf 100644 --- a/scripts/test-data/gnome-list +++ b/scripts/test-data/gnome2-list @@ -1,19 +1,20 @@ # Base libraries -dev-libs/glib +dev-libs/glib:2 x11-libs/startup-notification x11-libs/pango dev-libs/libcroco -dev-libs/libxml2 -dev-libs/libunique -gnome-base/gnome-desktop -gnome-base/librsvg +dev-libs/libxml2:2 +dev-libs/libunique:1 +gnome-base/gnome-desktop:2 +gnome-base/librsvg:2 media-libs/libcanberra net-libs/libsoup -x11-libs/libwnck +net-libs/libsoup-gnome +x11-libs/libwnck:1 x11-libs/libxklavier dev-libs/atk -x11-libs/gtk+ -x11-libs/vte +x11-libs/gtk+:2 +x11-libs/vte:0 =20 # Base utilities app-text/scrollkeeper @@ -32,15 +33,16 @@ dev-libs/liboobs dev-libs/totem-pl-parser dev-python/gdata gnome-base/libgnome-keyring -gnome-base/libgtop -gnome-extra/gtkhtml +gnome-base/libgtop:2 +gnome-extra/gtkhtml:3.14 gnome-extra/libgsf media-libs/audiofile media-libs/swfdec -x11-libs/gtksourceview +x11-libs/goocanvas:0 +x11-libs/gtksourceview:2.0 =20 # Theme-related -x11-themes/gtk-engines +x11-themes/gtk-engines:2 x11-themes/gnome-backgrounds x11-themes/gnome-icon-theme x11-themes/gnome-themes @@ -58,10 +60,10 @@ app-accessibility/gok app-accessibility/orca =20 # Deprecated libraries -gnome-base/gnome-vfs +gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libbonoboui -gnome-base/libglade +gnome-base/libglade:2.0 gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomekbd @@ -73,7 +75,7 @@ media-libs/libart_lgpl media-sound/esound =20 # Base applications -gnome-base/gconf +gnome-base/gconf:2 x11-wm/metacity sys-apps/gnome-disk-utility gnome-base/gvfs