Author: jsmeix Date: Thu Feb 10 16:26:40 2011 New Revision: 63393 URL: http://svn.opensuse.org/viewcvs/yast?rev=63393&view=rev Log: - Be backward compatible in the "Driver Packages" dialog regarding OpenPrintingPPDs-ghostscript and cups-drivers: It tries first to install OpenPrintingPPDs-ghostscript but if this fails it tries to install cups-drivers and it removes both OpenPrintingPPDs-ghostscript and cups-drivers if installed. - 2.20.8 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/driveradd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63393&r1=63392&r2=63393&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Feb 10 16:26:40 2011 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=63393&r1=63392&r2=63393&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Feb 10 16:26:40 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Feb 10 16:06:03 CET 2011 - jsmeix@suse.de + +- Be backward compatible in the "Driver Packages" dialog + regarding OpenPrintingPPDs-ghostscript and cups-drivers: + It tries first to install OpenPrintingPPDs-ghostscript + but if this fails it tries to install cups-drivers + and it removes both OpenPrintingPPDs-ghostscript and + cups-drivers if installed. +- 2.20.8 + +------------------------------------------------------------------- Fri Feb 4 14:51:44 CET 2011 - jsmeix@suse.de - Fixed the automatic configuration in printer_proposal.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=63393&r1=63392&r2=63393&view=diff ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Thu Feb 10 16:26:40 2011 @@ -388,10 +388,10 @@ `DownloadProgress( // Header of a DownloadProgress indicator: _("Retrieving printer driver information..."), create_database_progress_filename, - // On my openSUSE 11.1 the size is about 90000 bytes. - // The number 102400 results exactly "100.0 KB" in the + // On my openSUSE 11.4 the size is about 110000 bytes. + // The number 122880 results exactly "120.0 KB" in the // YaST Gtk user inteface for a DownloadProgress: - 102400 + 122880 ) ) ) Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63393&r1=63392&r2=63393&view=diff ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Thu Feb 10 16:26:40 2011 @@ -271,14 +271,34 @@ // for whatever product (e.g. a Live CD or a stripped DVD/CD in whatever magazine). boolean package_changed = false; if( OpenPrintingPPDs_ghostscript_install != OpenPrintingPPDs_ghostscript_installed ) - { if( OpenPrintingPPDs_ghostscript_install ) + { // Since openSUSE 11.4 OpenPrintingPPDs-ghostscript is to a certain extent the successor of cups-drivers + // (more precisely: OpenPrintingPPDs-ghostscript contains most of what cups-drivers contained), + // see https://bugzilla.novell.com/show_bug.cgi?id=641704 + // To be backward compatible try also cups-drivers: + if( OpenPrintingPPDs_ghostscript_install ) { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { // Try to install the old cups-drivers only if the newer OpenPrintingPPDs-ghostscript was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) - { package_changed = true; + { // Try to remove both OpenPrintingPPDs-ghostscript and cups-drivers if installed: + if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers", "installed" ) ) + { // The user must confirm each package which should be removed + // so that the user can decide not to remove cups-drivers: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "remove" ) ) + { package_changed = true; + } } } } @@ -409,7 +429,10 @@ } } if( splix_install != splix_installed ) - { if( splix_install ) + { // Since openSUSE 11.4 cups-drivers-splix is renamed splix, + // see https://bugzilla.novell.com/show_bug.cgi?id=659579 + // To be backward compatible try also cups-drivers-splix: + if( splix_install ) { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org