[yast-commit] r51991 - in /trunk/printer/src: Printer.ycp Printerlib.ycp

8 Oct 2008

Author: jsmeix
Date: Wed Oct  8 16:30:57 2008
New Revision: 51991

URL: http://svn.opensuse.org/viewcvs/yast?rev=51991&view=rev
Log:

Check if the cups-client RPM is installed
(strictly required) and if the cups RPM is
installed (recommended but not strictly required).

Prefer 'hp:/usb/' DeviceURIs by default.
The matching 'usb://HP/' is still available
via "More Connections".


Modified:
    trunk/printer/src/Printer.ycp
    trunk/printer/src/Printerlib.ycp

Modified: trunk/printer/src/Printer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=51991&r1=51990&r2=51991&view=diff
==============================================================================

--- trunk/printer/src/Printer.ycp (original)
+++ trunk/printer/src/Printer.ycp Wed Oct  8 16:30:57 2008
@@ -602,19 +602,38 @@
   Progress::New( // Header of a Progress::New:
                  _("Initializing Printer Configuration"),
                  " ",
-                 1,
+                 2,
                  [ // 1. progress stage name of a Progress::New:
-                   _("Autodetect already configured printers"),
+                   _("Check installed packages"),
+                   // 2. progress stage name of a Progress::New:
+                   _("Determine basic print system settings")
                  ],
                  [ // 1. progress step progress bar title of a Progress::New:
-                   _("Autodetecting already configured printers..."),
+                   _("Checking installed packages..."),
+                   // 2. progress step progress bar title of a Progress::New:
+                   _("Determining basic print system settings..."),
                    // Last progress step progress bar title of a Progress::New:
                    _("Finished")
                  ],
                  ""
                );
-  // Progress 1. stage (Autodetect already configured printers):
+  // Progress 1. stage (Check installed packages):
   if( Abort() ) return false;
+  // The cups-client RPM is the minimum requirement
+  // for accessing remote CUPS servers via a "client-only" config.
+  // Therefore abort (return false) if cups-client is not installed:
+  if( ! Printerlib::TestAndInstallPackage( "cups-client" ) )
+  { return false;
+  }
+  // The cups RPM ist the default requirement
+  // for accessing remote CUPS servers via CUPS Browsing
+  // and it is the minimum requirement for local print queues.
+  // Therefore try to install cups but because for a "client-only" config
+  // only cups-client is required, proceed even if cups is not installed:
+  Printerlib::TestAndInstallPackage( "cups" );
+  // Progress 2. stage (Determine basic print system settings):
+  if( Abort() ) return false;
+  Progress::NextStage();
   // Only in the second stage of the system installation make sure that a local cupsd is running
   // because it is needed for automated queue setup during system installation
   // see https://bugzilla.novell.com/show_bug.cgi?id=418585
@@ -875,6 +894,16 @@
     // which is needed here to preserve any entry to be on the safe side:
     connections = (list  >)merge( connection_wizard_connections, connections );
   }
+  // Determine if there is at least one "hp:/usb/" DeviceURI:
+  boolean hp_usb_uri_exists = false;
+  foreach( map< string, string > connection_entry,
+           connections,
+           { if( "hp:/usb/" == substring( connection_entry["uri"]:"", 0, 8 ) )
+             { hp_usb_uri_exists = true;
+               break;
+             }
+           }
+         );
   // Make a list of uri, model, and info entries of the connections
   // and take the connection_filter_string into account (if it is not the empty string).
   selected_connections_index = -1;
@@ -917,15 +946,25 @@
                        || "hp:/" == substring( uri, 0, 4 )
                        || "ConnectionWizardDialog" == class
                      )
-                   { // Add trailing spaces because the current YaST UI
-                     // has almost no additional space between table columns
-                     // in partitcular not where the widest entry in a column is:
-                     connection_items = add( connection_items, `item( `id( connections_index ),
-                                                                      model + " ",
-                                                                      uri + " ",
-                                                                      info
-                                                                    )
-                                           );
+                   { // Skip "usb://HP/" DeviceURIs if there is at least one "hp:/usb/" DeviceURI
+                     // so that the "hp:/usb/" DeviceURI is used with preference.
+                     // The "usb://HP/" DeviceURI is still available via "MoreConnections".
+                     if( "usb://hp/" == tolower( substring( uri, 0, 9 ) )
+                         && hp_usb_uri_exists
+                       )
+                     { y2milestone( "skipped 'usb://HP/' DeviceURI '%1'", uri );
+                     }
+                     else
+                     { // Add trailing spaces because the current YaST UI
+                       // has almost no additional space between table columns
+                       // in partitcular not where the widest entry in a column is:
+                       connection_items = add( connection_items, `item( `id( connections_index ),
+                                                                        model + " ",
+                                                                        uri + " ",
+                                                                        info
+                                                                      )
+                                             );
+                     }
                    }
                  }
                  else

Modified: trunk/printer/src/Printerlib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=51991&r1=51990&r2=51991&view=diff
==============================================================================
--- trunk/printer/src/Printerlib.ycp (original)
+++ trunk/printer/src/Printerlib.ycp Wed Oct  8 16:30:57 2008
@@ -33,6 +33,7 @@
 module "Printerlib";
 textdomain "printer";
 
+import "Package";
 import "Popup";
 import "Service";
 
@@ -75,6 +76,54 @@
   return true;
 }
 
+/**
+ * Test whether the package is installed (Package::Installed) and
+ * if not then test whether the package is available to be installed (Package::Available) and
+ * if yes then install it (Package::Install).
+ * @param package_name string of the package name
+ * @return true on success
+ */
+global boolean TestAndInstallPackage( string package_name )
+{ if( Package::Installed( package_name ) )
+  { return true;
+  }
+  // Is the package available to be installed?
+  // Package::Available returns nil if no package source is available.
+  boolean package_available = Package::Available( package_name );
+  if( nil == package_available )
+  { y2milestone( "Required package %1 is not installed and there is no package repository available.", package_name );
+    Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+                           _("Required package %1 is not installed and there is no package repository available."),
+                           package_name
+                         )
+                );
+    return false;
+  }
+  if( ! package_available )
+  { y2milestone( "Required package %1 is not installed and not available in the repository.", package_name );
+    Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+                           _("Required package %1 is not installed and not available in the repository."),
+                           package_name
+                         )
+                );
+    return false;
+  }
+  if( ! Package::Install( package_name ) )
+  { y2milestone( "Failed to install required package %1.", package_name );
+    Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name.
+                  // Only a simple message because:
+                  // Either the user has explicitely rejected to install the package,
+                  // or this error does not happen on a normal system
+                  // (i.e. a system which is not totally broken or totally messed up).
+                  sformat( _("Failed to install required package %1."),
+                             package_name
+                         )
+                );
+    return false;
+  }
+  return true;
+}
+
 // By default there is a local running cupsd.
 // But to be on the safe side, assume it is not:
 global boolean local_cupsd_accessible = false;

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r51991 - in /trunk/printer/src: Printer.ycp Printerlib.ycp

jsmeix＠svn.opensuse.org