[Aptitude-svn-commit] r4178 - in branches/aptitude-0.3/aptitude: .
doc/en doc/en/images
Daniel Burrows
dburrows at costa.debian.org
Thu Sep 22 19:28:27 UTC 2005
Author: dburrows
Date: Thu Sep 22 19:28:24 2005
New Revision: 4178
Added:
branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot5.png (contents, props changed)
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
branches/aptitude-0.3/aptitude/doc/en/images/broken-snapshot.png
branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot.png
branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot2.png
branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot3.png
branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot4.png
Log:
Update the tutorial on broken packageness.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Thu Sep 22 19:28:24 2005
@@ -1,5 +1,9 @@
2005-09-22 Daniel Burrows <dburrows at debian.org>
+ * doc/en/aptitude.xml, doc/en/images/broken-snapshot.png, doc/en/images/solution-screen-snapshot.png, doc/en/images/solution-screen-snapshot2.png, doc/en/images/solution-screen-snapshot3.png, doc/en/images/solution-screen-snapshot4.png, doc/en/images/solution-screen-snapshot5.png:
+
+ Update the broken packages tutorial.
+
* src/generic/problemresolver/problemresolver.h, src/generic/resolver_manager.cc:
Make approving and rejecting an action mutually exclusive:
Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml (original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml Thu Sep 22 19:28:24 2005
@@ -1094,16 +1094,16 @@
<textobject role='text'>
<screen> Actions Undo Package Search Options Views Help
f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
-aptitude 0.3.3 #Broken: 1 Will free 1335kB of disk space
- --- admin - Administrative utilities (install software, manage users, etc)
- --- base - The Debian base system
- --- devel - Utilities and programs for software development
- --- doc - Documentation and specialized programs for viewing documentation
- --- games - Games, toys, and fun programs
- --\ gnome - The GNOME Desktop System
- --\ main - The main Debian archive
-i grip 3.3.1-2 3.3.1-4
-ipA sound-juicer -1245kB 2.10.1-2 2.10.1-3
+aptitude 0.3.3 #Broken: 1 Will free 48.6MB of disk space
+i A nautilus 2.10.1-4 2.10.1-4
+i nautilus-cd-burner 2.10.2-1.1 2.10.2-1.1
+i A nautilus-data 2.10.1-4 2.10.1-4
+i netspeed 0.12.1-1 0.12.1-1
+i A oaf 0.6.10-3 0.6.10-3
+i pybliographer 1.2.6.2-1 1.2.6.2-1
+i rhythmbox 0.8.8-13 0.8.8-13
+i shermans-aquarium 3.0.1-1 3.0.1-1
+idA sound-juicer -1733kB 2.10.1-3 2.10.1-3
GNOME 2 CD Ripper
sound-juicer will be removed.
@@ -1112,9 +1112,9 @@
removal:
- * gnome-desktop-environment depends on sound-juicer (>= 2.10.1)
+ * gnome-desktop-environment depends on sound-juicer
-[1/...] Suggest 2 keeps
+[1(1)/...] Suggest 2 keeps
e: Examine !: Apply .: Next ,: Previous</screen>
</textobject>
</mediaobject>
@@ -1132,6 +1132,21 @@
<keycap>b</keycap> or search for <literal>~b</literal>.
</para>
+ <note>
+ <para>
+ The text <literal>[1(1)/...]</literal> indicates the
+ progress of &aptitude;'s dependency resolver. The first
+ number is the solution that you have currently selected,
+ and the second one is the number of solutions that
+ &aptitude; has already generated. The presence of the
+ text <quote><literal>...</literal></quote> indicates
+ that there may be additional solutions beyond the ones
+ generated; if &aptitude; knew for certain that it had
+ generated the only possible solution, this indicator
+ would read <literal>[1/1]</literal>.
+ </para>
+ </note>
+
<para>
To see more information about how &aptitude; thinks you
can solve this problem, press <keycap>e</keycap>. A
@@ -1149,8 +1164,8 @@
f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
Packages Resolve Dependencies
--\ Keep the following packages at their current version:
- gstreamer0.8-cdparanoia [0.8.10-1 (unstable, now)]
- sound-juicer [2.10.1-2 (now)]
+ gstreamer0.8-cdparanoia [0.8.11-1 (unstable, now)]
+ sound-juicer [2.10.1-3 (unstable, now)]
@@ -1167,7 +1182,7 @@
-[1/...] Suggest 2 keeps
+[1(1)/...] Suggest 2 keeps
e: Examine !: Apply .: Next ,: Previous</screen>
</textobject>
</mediaobject>
@@ -1194,9 +1209,9 @@
f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
Packages Resolve Dependencies
--\ Keep the following packages at their current version:
- sound-juicer [2.10.1-2 (now)]
+ sound-juicer [2.10.1-3 (unstable, now)]
--\ Downgrade the following packages:
- gstreamer0.8-cdparanoia [0.8.10-1 unstable, now -> 0.8.8-3 testing]
+ gstreamer0.8-cdparanoia [0.8.11-1 unstable, now -> 0.8.8-3 testing]
@@ -1212,7 +1227,7 @@
-[2/...] Suggest 1 keep,1 downgrade
+[2(2)/...] Suggest 1 keep,1 downgrade
e: Examine !: Apply .: Next ,: Previous</screen>
</textobject>
</mediaobject>
@@ -1242,25 +1257,25 @@
f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
Packages Resolve Dependencies
--\ Keep the following packages at their current version:
- gstreamer0.8-cdparanoia [0.8.10-1 (unstable, now)]
-R sound-juicer [2.10.1-2 (now)]
-
-
-
-
-
-
+ gstreamer0.8-cdparanoia [0.8.11-1 (unstable, now)]
+R sound-juicer [2.10.1-3 (unstable, now)]
+GNOME 2 CD Ripper
+gnome-desktop-environment depends upon sound-juicer
+--\ The following actions will resolve this dependency:
+ -> Remove gnome-desktop-environment [1:2.10.2.3 (unstable, testing, now)]
+R -> Cancel the removal of sound-juicer
+ -> Downgrade sound-juicer [2.10.1-3 (unstable, now) -> 0.6.1-2 (testing)]
-[1/...] Suggest 2 keeps
+[1(1)/...] Suggest 2 keeps
e: Examine !: Apply .: Next ,: Previous</screen>
</textobject>
</mediaobject>
@@ -1277,6 +1292,17 @@
generated and contain this action will be available.
</para>
+ <note>
+ <para>
+ In the above screen image, a description of
+ <systemitem>sound-juicer</systemitem> is displayed in
+ the middle of the screen; below it, you can see the
+ dependency that caused sound-juicer to be kept at its
+ current version, along with all the ways to resolve this
+ dependency that &aptitude; knows about.
+ </para>
+ </note>
+
<para>
For instance, if this rejection is imposed immediately
after removing <systemitem>sound-juicer</systemitem>,
@@ -1298,7 +1324,7 @@
f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
Packages Resolve Dependencies
--\ Remove the following packages:
- gnome-desktop-environment [1:2.10.1.1 (unstable, now)]
+ gnome-desktop-environment [1:2.10.2.3 (unstable, testing, now)]
@@ -1316,20 +1342,78 @@
-[2/...] Suggest 1 removal
+[2(2)/...] Suggest 1 removal
e: Examine !: Apply .: Next ,: Previous</screen>
</textobject>
</mediaobject>
</screenshot>
<para>
- You can cancel a rejection at any time by once again
- selecting the rejected package and pressing
- <keycap>r</keycap>. Once you do this, new solutions that
- you generate may again include the formerly rejected
- action.
+ Rejections are only applied to newly generated solutions:
+ that is, solutions that are generated when you press
+ <keycap>.</keycap> while viewing the last generated
+ solution. Previously generated solutions can still
+ contain rejections. You can cancel a rejection at any
+ time by once again selecting the rejected action and
+ pressing <keycap>r</keycap>; this will permit solutions
+ containing the action to be generated again, including any
+ solutions that were previously <quote>skipped</quote>.
</para>
+ <para>
+ The opposite of rejecting an action is approving it. To
+ approve an action, just select it and press
+ <keycap>a</keycap>; this forces the problem resolver to
+ choose the action whenever possible<footnote>
+ <para>
+ Approving an action is slightly different from requiring
+ all solutions to contain the action; what it means is
+ that given a choice between an approved action and a
+ non-approved action, the resolver will always pick the
+ approved action. If there are several possible approved
+ actions, all of them will be candidates to be placed
+ into the solution.
+ </para>
+ </footnote>. Approved actions will turn green and will be
+ marked with <quote>A</quote>, as in the following
+ screenshot:
+ </para>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref='images/solution-screen-snapshot5.png' format='PNG'/>
+ </imageobject>
+
+ <textobject role='text'>
+ <screen> Actions Undo Package Search Options Views Help
+f10: Menu ?: Help q: Quit u: Update g: Download/Install/Remove Pkgs
+ Packages Resolve Dependencies
+ --\ Remove the following packages:
+A gnome-desktop-environment [1:2.10.2.3 (unstable, testing, now)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[2(2)/...] Suggest 1 removal
+e: Examine !: Apply .: Next ,: Previous</screen>
+ </textobject>
+ </mediaobject>
+ </screenshot>
+
<important>
<para>
If you do not resolve any broken dependencies,
Modified: branches/aptitude-0.3/aptitude/doc/en/images/broken-snapshot.png
==============================================================================
Binary files. No diff available.
Modified: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot.png
==============================================================================
Binary files. No diff available.
Modified: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot2.png
==============================================================================
Binary files. No diff available.
Modified: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot3.png
==============================================================================
Binary files. No diff available.
Modified: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot4.png
==============================================================================
Binary files. No diff available.
Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot5.png
==============================================================================
Binary file. No diff available.
More information about the Aptitude-svn-commit
mailing list