rpms/anaconda/F-12 0001-Use-proper-logic-when-checking-repo-id.patch, NONE, 1.1 anaconda.spec, 1.838, 1.839

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6454

Modified Files:
	anaconda.spec 
Added Files:
	0001-Use-proper-logic-when-checking-repo-id.patch 
Log Message:
* Sun Nov 08 2009 Jesse Keating <jkeating at redhat.com> - 12.46-2
- Patch to make add on repos show up during package selection again


0001-Use-proper-logic-when-checking-repo-id.patch:
 yuminstall.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Use-proper-logic-when-checking-repo-id.patch ---
>From 28516bb9a400773b7759c41ef6654d4da5d8719c Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat.com>
Date: Sun, 8 Nov 2009 14:16:30 -0800
Subject: [PATCH] Use proper logic when checking repo id

Using string.find is a bit deprecated, as you have to do a
"string.find("foo") != -1"  instead of just "foo" in string

In this case, it means we throw every single repo out when BETANAG is
turned off, not what we want to happen here. Just fixing the one failing
if statement for F-12, converting all these string.finds to the newer
construct on devel branch.
---
 yuminstall.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index df34153..25a445d 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -557,7 +557,7 @@ class AnacondaYum(YumSorter):
             raise RepoError, "Repo %s contains -source or -debuginfo, excluding" % name
 
         # this is a little hard-coded, but it's effective
-        if not BETANAG and (repo.id.find("rawhide") or repo.id.find("development")):
+        if not BETANAG and ("rawhide" in repo.id or "development" in repo.id):
             name = repo.name
             del(repo)
             raise RepoError, "Excluding devel repo %s for non-devel anaconda" % name
-- 
1.6.5.2



Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -p -r1.838 -r1.839
--- anaconda.spec	7 Nov 2009 00:14:38 -0000	1.838
+++ anaconda.spec	8 Nov 2009 22:47:20 -0000	1.839
@@ -4,7 +4,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 12.46
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -152,6 +152,7 @@ Provides: anaconda-images = %{version}-%
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
 Obsoletes: booty
+Patch0: 0001-Use-proper-logic-when-checking-repo-id.patch
 
 %description
 The anaconda package contains the program which was used to install your
@@ -159,6 +160,7 @@ system.  These files are of little use o
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -217,6 +219,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sun Nov 08 2009 Jesse Keating <jkeating at redhat.com> - 12.46-2
+- Patch to make add on repos show up during package selection again
+
 * Fri Nov 06 2009 David Cantrell <dcantrell at redhat.com> - 12.46-1
 - Correct modopts initialization in loader (take 2) (#531932). (dcantrell)