diff --git a/.cvsignore b/.cvsignore index 22faf85..9f4c9b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -preupgrade-0.9.3.tar.gz +preupgrade-0.9.9.tar.gz diff --git a/preupgrade-0.9.8-f10beta.patch b/preupgrade-0.9.8-f10beta.patch deleted file mode 100644 index 33b529d..0000000 --- a/preupgrade-0.9.8-f10beta.patch +++ /dev/null @@ -1,20 +0,0 @@ -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. diff --git a/preupgrade-0.9.8-fix-resume.patch b/preupgrade-0.9.8-fix-resume.patch deleted file mode 100644 index ff96431..0000000 --- a/preupgrade-0.9.8-fix-resume.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - diff --git a/preupgrade.spec b/preupgrade.spec index 6333914..f12fca9 100644 --- a/preupgrade.spec +++ b/preupgrade.spec @@ -1,13 +1,12 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Preresolves dependencies and prepares a system for an upgrade Name: preupgrade -Version: 0.9.8 -Release: 2%{?dist} +Version: 0.9.9 +Release: 1%{?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 +Source1: http://mirrors.fedoraproject.org/releases.txt URL: https://fedorahosted.org/preupgrade/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,7 +20,8 @@ Requires: anaconda-yum-plugins # F10 anaconda expects to be handed a valid yum repo Requires: createrepo # yum 3.2.18 is needed to enable the above plugins at runtime -Requires: yum-metadata-parser, yum >= 3.2.18 +# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks +Requires: yum-metadata-parser, yum >= 3.2.19 Requires: usermode Requires: e2fsprogs Requires(post): mkinitrd @@ -33,8 +33,6 @@ ready for an upgrade via anaconda. %prep %setup -q -%patch1 -p1 -b .fix-resume -%patch2 -p1 -b .f10beta %build # no op @@ -45,18 +43,18 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_bindir} ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name} ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name}-cli +# NOTE: we ship this *only* for PackageKit - it is ignored by preupgrade! +# preupgrade itself pulls data from {$PWD,$PWD/data}/releases.txt or +# http://mirrors.fedoraproject.org/releases.txt +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/preupgrade/releases.list %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/grubby --remove-kernel=/boot/upgrade/vmlinuz -%{__rm} -rf /boot/upgrade - %files %defattr(-, root, root) %dir %{_datadir}/%{name} -%doc ChangeLog README COPYING +%doc ChangeLog README COPYING data/releases.txt %config(noreplace) %{_sysconfdir}/pam.d/* %config(noreplace) %{_sysconfdir}/security/console.apps/* %{_datadir}/%{name}/* @@ -67,6 +65,15 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/%{name} %changelog +* Mon Nov 3 2008 Will Woods - 0.9.9-1 +- Fetch release data from http://mirrors.fedoraproject.org/releases.txt +- Recognize new metadata filenames +- Generate kickstart for all installs +- Automatically upgrade bootloader config during upgrade +- preupgrade-cli: Add --vnc for headless remote installs +- preupgrade-cli: Properly set locale so we don't crash on non-en_US +- preupgrade-cli: Fix --help + * Thu Oct 2 2008 Will Woods - 0.9.8-2 - Clear cache after user decides not to resume an old run - Add Fedora 10 Beta to releases.list diff --git a/sources b/sources index 9f33629..17af02d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6eb699b3a55b46fa98836086ad96880 preupgrade-0.9.8.tar.gz +cd7234c8073b2cd702181f4ea30a361e preupgrade-0.9.9.tar.gz