Author: mzugec Date: Mon Jun 2 11:27:11 2008 New Revision: 47978

URL: http://svn.opensuse.org/viewcvs/yast?rev=47978&view=rev Log: install hplip only in case any "hp:/" configured queue exists (bnc#395386)

Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printer.ycp

Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=47978&r1=... ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Jun 2 11:27:11 2008 @@ -1 +1 @@ -2.16.31 +2.16.32

Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.cha... ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Jun 2 11:27:11 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 2 11:22:52 CEST 2008 - mzugec@suse.cz + +- install hplip only in case any "hp:/" configured queue exists +(bnc#395386) +- 2.16.32 + +------------------------------------------------------------------- Thu May 22 13:17:27 CEST 2008 - mzugec@suse.cz

- install and use hplip instead of hpijs-standalone (bnc#388149)

Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?r... ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Jun 2 11:27:11 2008 @@ -1267,7 +1267,9 @@ if (testAbort ()) return false;

// Printerlib::readHplip(); - if (Package::Installed("hpijs-standalone") || (!Package::Installed("hplip") && PackageSystem::Available("hplip"))) Printerlib::installHplip(); + if (!Package::Installed("hplip") && PackageSystem::Available("hplip")){ + if (SCR::Execute(.target.bash, "lpstat -v|cut -d' ' -f4|grep -q '^hp:/'")==0) Printerlib::installHplip(); + } CUPS::enable_netcat = PackageSystem::Installed("netcat");

if (! checkSpooler ()) return false;