Author: mzugec Date: Wed May 7 15:30:05 2008 New Revision: 47353 URL: http://svn.opensuse.org/viewcvs/yast?rev=47353&view=rev Log: stop/start cupsd according client/server mode (bnc#387249) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printer.ycp trunk/printer/testsuite/tests/cupsWrite.out Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=47353&r1=47352&r2=47353&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed May 7 15:30:05 2008 @@ -1 +1 @@ -2.16.22 +2.16.23 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=47353&r1=47352&r2=47353&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed May 7 15:30:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 7 12:50:54 CEST 2008 - mzugec@suse.de + +- stop/start cupsd according client/server mode (bnc#387249) +- 2.16.23 + +------------------------------------------------------------------- Tue May 6 20:06:02 CEST 2008 - mzugec@suse.cz - set window size by MinSize() (bnc#386940) Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?rev=47353&r1=47352&r2=47353&view=diff ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Wed May 7 15:30:05 2008 @@ -1616,7 +1616,6 @@ // #218760 - cups-drivers is not automatically included if (size(printcap)>0) PackageSystem::CheckAndInstallPackagesInteractive([ "cups", "cups-drivers", "gutenprint" ]); // fixed #190173 - lpd printer doesn't get installed (in other MODEs cupsd already is running) - Spooler::AdjustServices (size (printcap) > 0); if (Mode::autoinst()) { // y2milestone("autoyast mode - starting CUPS"); // CUPS::StartDaemon(); @@ -1634,6 +1633,7 @@ if (SCR::Execute(.target.bash, "rm /etc/cups/cupsd.conf.old")!=0) y2error("Cannot remove backup of /etc/cups/cupsd.conf"); } + if (Spooler::Get() == "cups") Spooler::AdjustServices (size (printcap) > 0); Progress::NextStage (); // adjst services Modified: trunk/printer/testsuite/tests/cupsWrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/cupsWrite.out?rev=47353&r1=47352&r2=47353&view=diff ============================================================================== --- trunk/printer/testsuite/tests/cupsWrite.out (original) +++ trunk/printer/testsuite/tests/cupsWrite.out Wed May 7 15:30:05 2008 @@ -2,10 +2,6 @@ Read .target.size "/var/run/listen_remote_ipp.pid" 555 Read .target.string "/var/run/listen_remote_ipp.pid" "" Execute .target.bash "kill -15 " 0 -Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Read .init.scripts.exists "lpd" true -Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 Write .etc.cups.client_conf.value.ServerName nil true Write .etc.cups.client_conf nil true Execute .target.bash "cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old" 0 @@ -14,6 +10,10 @@ Write .etc.cups.cupsd_conf nil true Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""] Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0 +Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 +Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 +Read .init.scripts.exists "lpd" true +Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 Write .cups.default_dest "" true Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[], "version":523] true Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0 @@ -29,16 +29,16 @@ Read .target.size "/var/run/listen_remote_ipp.pid" 555 Read .target.string "/var/run/listen_remote_ipp.pid" "" Execute .target.bash "kill -15 " 0 -Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Read .init.scripts.exists "lpd" true -Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 Write .etc.cups.client_conf.value.ServerName nil true Write .etc.cups.client_conf nil true Execute .target.bash "cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old" 0 Write .etc.cups.cupsd_conf nil true Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""] Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0 +Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 +Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 +Read .init.scripts.exists "lpd" true +Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 Write .cups.printers.remove "lpx" true Execute .target.bash "/bin/grep '#this database was generated during package building' /var/lib/YaST2/ppd_db.ycp" 0 Read .ppd.db.changed false -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org