Bug#511605: Bug#513625: aptitude upgrade action described incorrectly for the version of aptitude that will be installed
Hello,
On Sat, Aug 22, 2009 at 09:59:40AM +0900, osamu@debian.org wrote:
> On Sat, Aug 22, 2009 at 01:08:10AM +0200, Nicolas François wrote:
> > Dear aptitude maintainers,
>
> I am not but ...
and your comments are very welcome ;)
> > Would it be correct to describe it with the following paragraph?
> >
> > This has the effect of upgrading those packages which can be
> > upgraded without requiring any other packages to be removed.
>
> Well, I should say good enough for lenny but for squeeze we need to do
>
> s/aptitude upgrade/aptitude safe-upgrade/g
> s/aptitude dist-upgrade/aptitude full-upgrade/g
>
> (Yes, it is not just "aptitude upgrade". Next example too needs change)
>
> These upgrade and dist-upgrade options were the option in old days as I
> remember. These options are still valid in lenny but they are deprecated
> now according to the manual.
>
> Since these are run in old system (possibly semi upgraded to testing by
> some), it may be safe to keep them as is for lenny release note. But If you
> are prepairing for squeeze, we need to change.
aptitude is updated in the early phases, so we can already change (most
of) the commands for the Lenny release notes.
Also, as noted in Bug#511605, this will "indirectly be leading people on
the right path for upgrade".
Here is my proposed patch.
Best Regards,
--
Nekral
Index: en/upgrading.dbk
===================================================================
--- en/upgrading.dbk (révision 6878)
+++ en/upgrading.dbk (copie de travail)
@@ -393,7 +393,7 @@
to &releasename;. If you use one of these exceptions, set the
<literal>Pin-Priority</literal> (see <citerefentry> <refentrytitle>apt_preferences</refentrytitle> <manvolnum>5</manvolnum> </citerefentry>)
temporarily to <literal>1001</literal> for all packages from &releasename;,
- and you should be able to do a safe dist-upgrade too. See the
+ and you should be able to do a safe full-upgrade too. See the
<ulink
url="http://backports.org/dokuwiki/doku.php?id=faq";>backports
FAQ</ulink>.
@@ -695,6 +695,8 @@
detailed information of the disk space needed for the installation. Before
executing the upgrade, you can see this estimate by running:
</para>
+<!-- FIXME: dist-upgrade should be changed to full-upgrade for the Squeeze
+ release notes -->
<screen>
# aptitude -y -s -f --with-recommends dist-upgrade
[ ... ]
@@ -852,7 +854,7 @@
of packages requiring immediate configuration and <systemitem
role="package">aptitude</systemitem> is smarter at searching for
solutions to satisfy the dependencies. These two features
- are heavily involved during the dist-upgrade to &releasename;, so it
+ are heavily involved during the upgrade to &releasename;, so it
is necessary to upgrade these two packages before upgrading
anything else. For <systemitem role="package">apt</systemitem>, run:
<screen># apt-get install apt</screen>
@@ -897,20 +899,21 @@
<title>Minimal system upgrade</title>
<para>
Because of certain necessary package conflicts between &oldreleasename; and &releasename;, running
-<literal>aptitude dist-upgrade</literal> directly will often remove large
+<literal>aptitude full-upgrade</literal> directly will often remove large
numbers of packages that you will want to keep. We therefore recommend a
two-part upgrade process, first a minimal upgrade to overcome these conflicts,
-then a full <literal>dist-upgrade</literal>.
+then a <literal>full-upgrade</literal>.
</para>
<para>
First, run:
</para>
<screen>
-# aptitude upgrade
+# aptitude safe-upgrade
</screen>
<para>
This has the effect of upgrading those packages which can be upgraded without
-requiring any other packages to be removed or installed.
+requiring any other packages to be removed, unless they are unused. New
+packages will be installed if needed to resolve dependencies.
</para>
<para>
The next step will vary depending on the set of packages that you have
@@ -984,7 +987,7 @@
You are now ready to continue with the main part of the upgrade. Execute:
</para>
<screen>
-# aptitude dist-upgrade
+# aptitude full-upgrade
</screen>
<para>
This will perform a complete upgrade of the system, i.e. install the newest
@@ -1143,9 +1146,9 @@
<section id="kernel-metapackage">
<title>Installing the kernel metapackage</title>
<para>
-When you dist-upgrade from &oldreleasename; to &releasename;, it is strongly recommended that you
+When you upgrade from &oldreleasename; to &releasename;, it is strongly recommended that you
install a new linux-image-2.6-* metapackage. This package may be installed
-automatically by the dist-upgrade process. You can verify this by running:
+automatically by the full-upgrade process. You can verify this by running:
</para>
<screen>
# dpkg -l "linux-image*" | grep ^ii
@@ -1183,7 +1186,7 @@
</para>
<para>
If possible, it is to your advantage to upgrade the kernel package separately
-from the main <literal>dist-upgrade</literal> to reduce the chances of a
+from the main <literal>full-upgrade</literal> to reduce the chances of a
temporarily non-bootable system.
Note that this should only be done after the
minimal upgrade process described in <xref linkend="minimal-upgrade"/>.
@@ -1282,7 +1285,7 @@
<section id="nownownow">
<title>Things to do before rebooting</title>
<para>
-When <literal>aptitude dist-upgrade</literal> has finished, the <quote>formal</quote> upgrade
+When <literal>aptitude full-upgrade</literal> has finished, the <quote>formal</quote> upgrade
is complete, but there are some other things that should be taken care of
<emphasis>before</emphasis> the next reboot.
</para>
Reply to: