[Aptitude-svn-commit] r3920 - in branches/aptitude-0.3/aptitude: . doc/en doc/en/images

Daniel Burrows dburrows at costa.debian.org
Thu Aug 18 23:14:47 UTC 2005


Author: dburrows
Date: Thu Aug 18 23:14:42 2005
New Revision: 3920

Added:
   branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot.png   (contents, props changed)
   branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot2.png   (contents, props changed)
   branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot3.png   (contents, props changed)
   branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot4.png   (contents, props changed)
Removed:
   branches/aptitude-0.3/aptitude/doc/en/images/solution-dialog-snapshot.png
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
Log:
More documentation on the solution navigator, talk about the style of rejected/accepted actions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 23:14:42 2005
@@ -1,5 +1,11 @@
 2005-08-18  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml:
+
+	  Extend the tutorial on managing packages with notes about broken
+	  dependencies, and document the new styles corresponding to
+	  solutions.
+
 	* src/solution_fragment.cc:
 
 	  Add a newline after each note about an unresolved

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 Aug 18 23:14:42 2005
@@ -1082,7 +1082,7 @@
 	    <firstterm>broken</firstterm>.  &aptitude; will warn you
 	    when this happens, and explain why it occured.  For
 	    instance, here is what happens if I attempt to remove
-	    <systemitem>libkexif1</systemitem>:
+	    <systemitem>sound-juicer</systemitem>:
 	  </para>
 
 	  <screenshot>
@@ -1094,26 +1094,27 @@
 	      <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.1       #Broken: 1   Will free 397kB of disk space
-i A   libjsw2                                              1:1.5.0-7  1:1.5.0-7
-i A   libkadm55                                            1.3.6-3    1.3.6-3
-i A   libkcal2a                                            4:3.3.2-3  4:3.3.2-3
-i A   libkcddb1                                            4:3.3.2-1  4:3.3.2-1
-i A   libkdeedu1                                           4:3.3.2-3  4:3.3.2-3
-i A   libkdenetwork2                                       4:3.3.2-3  4:3.3.2-3
-i A   libkdepim1                                           4:3.3.2-3  4:3.3.2-3
-idA   libkexif1                                    -397kB  0.2.1-2    0.2.1-2   
-library for KDE to read/display/edit EXIF informations (runtime)
-libkexif1 will be removed.
+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
+GNOME 2 CD Ripper
+sound-juicer will be removed.
 
 
-The following packages depend on libkexif1 and will be broken by its removal:
+The following packages depend on sound-juicer and will be broken by its
+removal:
 
 
-  * digikam depends on libkexif1 (>= 0.2.1)
+  * gnome-desktop-environment depends on sound-juicer (>= 2.10.1)
 
-
-[1/2] Suggest 1 keep
+[1/...] Suggest 2 keeps
 e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      </textobject>
 	    </mediaobject>
@@ -1133,68 +1134,213 @@
 
 	  <para>
 	    To see more information about how &aptitude; thinks you
-	    can solve this problem, press <keycap>e</keycap>.  You can
-	    see more solutions by pressing <keycap>.</keycap>; once
-	    you have done so, you can return to solutions you skipped
-	    past by pressing <keycap>,</keycap>.  Finally, when you
-	    have found a solution that you are satisfied with, you can
-	    press <keycap>!</keycap> to execute it.
+	    can solve this problem, press <keycap>e</keycap>.  A
+	    screen similar to the following will appear:
+	  </para>
+
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref='images/solution-screen-snapshot.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
+  --\ Keep the following packages at their current version:
+    gstreamer0.8-cdparanoia                           [0.8.10-1 (unstable, now)]
+    sound-juicer                                                [2.10.1-2 (now)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[1/...] Suggest 2 keeps
+e: Examine  !: Apply  .: Next  ,: Previous</screen>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
+
+	  <para>
+	    From here, you can see more solutions by pressing
+	    <keycap>.</keycap> or return to solutions that you
+	    previously examined by pressing <keycap>,</keycap>.  To
+	    apply the current solution and return to the package list,
+	    press <keycap>!</keycap>.  For instance, pressing
+	    <keycap>.</keycap> while the above screen is displayed
+	    results in the following solution being presented:
 	  </para>
 
+	  <screenshot id='solutionScreenSnapshot2'>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref='images/solution-screen-snapshot2.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
+  --\ Keep the following packages at their current version:
+    sound-juicer                                                [2.10.1-2 (now)]
+  --\ Downgrade the following packages:
+    gstreamer0.8-cdparanoia          [0.8.10-1 unstable, now -> 0.8.8-3 testing]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[2/...] Suggest 1 keep,1 downgrade
+e: Examine  !: Apply  .: Next  ,: Previous</screen>
+	      </textobject>
+	    </mediaobject>
+	  </screenshot>
+
 	  <para>
-	    For instance, in the following screen-shot, I have decided
-	    that I really want to remove
-	    <systemitem>libkexif1</systemitem>, even if it means that
-	    the <systemitem>digikam</systemitem> package must also be
-	    removed.  Pressing <keycap>!</keycap> or selecting the
-	    <quote>Apply</quote> button will flag
-	    <systemitem>digikam</systemitem> for removal, resolving
-	    the broken dependency.
+	    In addition to the basic solution navigation commands, you
+	    can press <keycap>r</keycap> to <quote>reject</quote>
+	    actions of which you disapprove.  For instance, the first
+	    solution will cancel the removal of
+	    <systemitem>sound-juicer</systemitem> -- the very action
+	    we were trying to perform!  By pressing <keycap>r</keycap>
+	    on the item corrsponding to this action, we can tell
+	    &aptitude; that it should not cancel the removal of
+	    sound-juicer in this way.
 	  </para>
 
 	  <screenshot>
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref='images/solution-dialog-snapshot.png' format='PNG'/>
+		<imagedata fileref='images/solution-screen-snapshot3.png' format='PNG'/>
 	      </imageobject>
 
-	    <textobject role='text'>
-<screen> Actions  Undo  Package  Search  Options  Views  Help
+	      <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.1       #Broken: 1   Will free 397kB of disk space
-i A   libjsw2                                              1:1.5.0-7  1:1.5.0-7
-i A   libkadm55                                            1.3.6-3    1.3.6-3
-i A   libkcal2a                                            4:3.3.2-3  4:3.3.2-3
-i A   libkcddb1                                            4:3.3.2-1  4:3.3.2-1
-i A   libkdeedu1                                           4:3.3.2-3  4:3.3.2-3
-i A   libkdenetwork2+--------------------------------------+:3.3.2-3  4:3.3.2-3
-i A   libkdepim1    |Remove the following packages:        |:3.3.2-3  4:3.3.2-3
-idA   libkexif1     |digikam                               |.2.1-2    0.2.1-2
-library for KDE to r|                                      |ime)
-libkexif1 will be re|Score is -261                         |
-                    |[ Previous ][ Next ][ Apply ][ Close ]|
-                    +--------------------------------------+
-The following packages depend on libkexif1 and will be broken by its removal:
+                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)]
+
+
+
+
+
+
+
 
 
-  * digikam depends on libkexif1 (>= 0.2.1)
 
 
-[2/2] Suggest 1 removal
+
+
+
+
+
+[1/...] Suggest 2 keeps
 e: Examine  !: Apply  .: Next  ,: Previous</screen>
-	    </textobject>
+	      </textobject>
 	    </mediaobject>
 	  </screenshot>
 
 	  <para>
-	    If you do not resolve the situation, &aptitude; will try
-	    to fix things for you when you commit your selections by
-	    pressing <keycap>g</keycap>.  However, it is hard to
-	    automatically solve dependency problems, and you may not
-	    be happy with the results, so it is generally better to
-	    solve problems such as this before committing your
-	    selections.
+	    As you can see, the list item corresponding to keeping
+	    <systemitem>sound-juicer</systemitem> at its current
+	    version has turned red and been marked with an
+	    <quote>R</quote>, indicating that it has been rejected.
+	    Solutions that you generate in the future (that is, any
+	    solution that you have not yet viewed) will not include
+	    this action, although solutions that were already
+	    generated and contain this action will be available.
 	  </para>
+
+	  <para>
+	    For instance, if this rejection is imposed immediately
+	    after removing <systemitem>sound-juicer</systemitem>,
+	    pressing <keycap>.</keycap> retrieves the following
+	    solution, skipping the <link
+	    linkend='solutionScreenSnapshot2'>solution</link> that
+	    cancels the installation of sound-juicer and downgrades
+	    gstreamer0.8-cdparanoia.
+	  </para>
+
+	  <screenshot>
+	    <mediaobject>
+	      <imageobject>
+		<imagedata fileref='images/solution-screen-snapshot4.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:
+    gnome-desktop-environment                       [1:2.10.1.1 (unstable, now)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[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.
+	  </para>
+
+	  <important>
+	    <para>
+	      If you do not resolve any broken dependencies,
+	      &aptitude; will automatically implement its current
+	      suggestion when you commit your selections by pressing
+	      <keycap>g</keycap>.  However, it is hard to
+	      automatically solve dependency problems, and you may not
+	      be happy with the results, so it is generally better to
+	      solve problems such as this <emphasis>before</emphasis>
+	      committing your selections.
+	    </para>
+	  </important>
 	</section>
       </section>
 
@@ -6323,6 +6469,22 @@
 		  </entry>
 		</row>
 
+		<row>
+		  <entry><literal>SolutionActionAccepted</literal></entry>
+		  <entry><literal>fg white; bg green;</literal></entry>
+		  <entry>
+		    The style of accepted actions in a solution.
+		  </entry>
+		</row>
+
+		<row>
+		  <entry><literal>SolutionActionRejected</literal></entry>
+		  <entry><literal>fg white; bg red;</literal></entry>
+		  <entry>
+		    The style of rejected actions in a solution.
+		  </entry>
+		</row>
+
 		<row id='colorScreenStatusColor'>
 		  <entry><literal>Status</literal></entry>
 		  <entry><literal>fg white; bg blue; set bold;</literal></entry>

Modified: branches/aptitude-0.3/aptitude/doc/en/images/broken-snapshot.png
==============================================================================
Binary files. No diff available.

Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot.png
==============================================================================
Binary file. No diff available.

Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot2.png
==============================================================================
Binary file. No diff available.

Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot3.png
==============================================================================
Binary file. No diff available.

Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-screen-snapshot4.png
==============================================================================
Binary file. No diff available.



More information about the Aptitude-svn-commit mailing list