rpms/preupgrade/F-9 preupgrade-0.9.8-f10beta.patch, NONE, 1.1 preupgrade-0.9.8-fix-resume.patch, NONE, 1.1 preupgrade.spec, 1.6, 1.7
Will Woods
wwoods at fedoraproject.org
Thu Oct 2 22:54:22 UTC 2008
- Previous message: rpms/preupgrade/devel preupgrade-0.9.8-f10beta.patch, NONE, 1.1 preupgrade-0.9.8-fix-resume.patch, NONE, 1.1 preupgrade.spec, 1.5, 1.6
- Next message: rpms/preupgrade/F-8 preupgrade-0.9.8-f10beta.patch, NONE, 1.1 preupgrade-0.9.8-fix-resume.patch, NONE, 1.1 preupgrade.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wwoods
Update of /cvs/pkgs/rpms/preupgrade/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4105
Modified Files:
preupgrade.spec
Added Files:
preupgrade-0.9.8-f10beta.patch
preupgrade-0.9.8-fix-resume.patch
Log Message:
fix resume, add f10b
preupgrade-0.9.8-f10beta.patch:
--- NEW FILE preupgrade-0.9.8-f10beta.patch ---
diff -up preupgrade-0.9.8/data/releases.list.f10beta preupgrade-0.9.8/data/releases.list
--- preupgrade-0.9.8/data/releases.list.f10beta 2008-10-02 18:47:36.000000000 -0400
+++ preupgrade-0.9.8/data/releases.list 2008-10-02 18:47:47.000000000 -0400
@@ -34,11 +34,11 @@ version=999
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os
-#[Fedora 10 (Cambridge) Beta]
-#stable=False
-#preupgrade-ok=True
-#version=9.92
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/test/10-BetaFedora/$basearch/os
+[Fedora 10 (Cambridge) Beta]
+stable=False
+preupgrade-ok=True
+version=9.92
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/test/10-Beta/Fedora/$basearch/os
# You can't reliably preupgrade to these.
# They're only here so we know when they've gone EOL.
preupgrade-0.9.8-fix-resume.patch:
--- NEW FILE preupgrade-0.9.8-fix-resume.patch ---
diff -up preupgrade-0.9.8/preupgrade-gtk.py.fix-resume preupgrade-0.9.8/preupgrade-gtk.py
--- preupgrade-0.9.8/preupgrade-gtk.py.fix-resume 2008-10-02 18:46:30.000000000 -0400
+++ preupgrade-0.9.8/preupgrade-gtk.py 2008-10-02 18:46:46.000000000 -0400
@@ -325,7 +325,9 @@ class PreUpgradeGtk(PreUpgradeController
r = questionDialog(self.ui.assistant,
"Would you like to resume your upgrade to %s?" % resuming)
if not r:
- os.unlink(preupgrade.runfile)
+ # clear out old caches / boot files / etc
+ print "Clearing data from upgrade to %s" % resuming
+ self.pu.clear_incomplete_run()
else:
# Act like we just hit the 'Apply' button
if resuming not in releases:
diff -up preupgrade-0.9.8/preupgrade/__init__.py.fix-resume preupgrade-0.9.8/preupgrade/__init__.py
--- preupgrade-0.9.8/preupgrade/__init__.py.fix-resume 2008-10-02 18:46:41.000000000 -0400
+++ preupgrade-0.9.8/preupgrade/__init__.py 2008-10-02 18:46:55.000000000 -0400
@@ -552,6 +552,17 @@ class PreUpgrade(yum.YumBase):
pass
return releasename
+ def clear_incomplete_run(self):
+ '''Clear all the saved data for an incomplete run.'''
+ release = self.resuming_run()
+ assert release != None
+ self.setup(release)
+ self.setup_update_repo()
+ self.remove_repo_cache()
+ self.remove_boot_files()
+ os.unlink(runfile)
+ self.clear_update_repo()
+
def retrieve_critical_boot_files(self):
# relative tmp FIXME XXX
Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-9/preupgrade.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- preupgrade.spec 18 Sep 2008 21:26:51 -0000 1.6
+++ preupgrade.spec 2 Oct 2008 22:53:52 -0000 1.7
@@ -2,10 +2,12 @@
Summary: Preresolves dependencies and prepares a system for an upgrade
Name: preupgrade
Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Patch1: preupgrade-0.9.8-fix-resume.patch
+Patch2: preupgrade-0.9.8-f10beta.patch
URL: https://fedorahosted.org/preupgrade/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -31,6 +33,8 @@
%prep
%setup -q
+%patch1 -p1 -b .fix-resume
+%patch2 -p1 -b .f10beta
%build
# no op
@@ -63,6 +67,10 @@
%{python_sitelib}/%{name}
%changelog
+* Thu Oct 2 2008 Will Woods <wwoods at redhat.com> - 0.9.8-2
+- Clear cache after user decides not to resume an old run
+- Add Fedora 10 Beta to releases.list
+
* Thu Sep 18 2008 Will Woods <wwoods at redhat.com> - 0.9.8-1
- GUI version prompts to resume interrupted runs
- Checks for available disk space before downloading / rebooting
- Previous message: rpms/preupgrade/devel preupgrade-0.9.8-f10beta.patch, NONE, 1.1 preupgrade-0.9.8-fix-resume.patch, NONE, 1.1 preupgrade.spec, 1.5, 1.6
- Next message: rpms/preupgrade/F-8 preupgrade-0.9.8-f10beta.patch, NONE, 1.1 preupgrade-0.9.8-fix-resume.patch, NONE, 1.1 preupgrade.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list