rpms/preupgrade/F-7 retrieve-treeinfo-from-instrepo.patch, NONE, 1.1 preupgrade.spec, 1.4, 1.5

[Will Woods (wwoods)]

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25377/F-7

Modified Files:
	preupgrade.spec 
Added Files:
	retrieve-treeinfo-from-instrepo.patch 
Log Message:
Fix bug #446244

retrieve-treeinfo-from-instrepo.patch:

--- NEW FILE retrieve-treeinfo-from-instrepo.patch ---
=== modified file 'preupgrade/__init__.py'
--- preupgrade/__init__.py	2008-05-02 14:50:34 +0000
+++ preupgrade/__init__.py	2008-05-13 18:10:41 +0000
@@ -369,7 +369,7 @@
         # min image
         # example:
         #   http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/.treeinfo
-        tif = self.distrepo.grab.urlopen('/.treeinfo')
+        tif = self.instrepo.grab.urlopen('/.treeinfo')
         #cracked out ppc issues, etc
         archlist = [self.conf.yumvar['basearch']]
         if isParaVirt():



Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-7/preupgrade.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- preupgrade.spec	13 May 2008 14:26:53 -0000	1.4
+++ preupgrade.spec	13 May 2008 18:42:56 -0000	1.5
@@ -2,11 +2,12 @@
 Summary: Preresolves dependencies and prepares a system for an upgrade
 Name: preupgrade
 Version: 0.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
 Patch0: enable-f9.patch
+Patch1: retrieve-treeinfo-from-instrepo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 
 
 %build
 # no op
@@ -55,6 +57,9 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Tue May 13 2008 Will Woods <wwoods at redhat.com> - 0.9.3-3
+- Fix hang on "Downloading installer metadata" (bug #446244)
+
 * Tue May 13 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-2
 - enable F9 in releases.list