September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40737 - in /trunk/printer: package/yast2-printer.changes testsuite/tests/detectPrinters.out testsuite/tests/detectPrinters.ycp
by mzugec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mzugec Date: Mon Sep 3 17:30:44 2007 New Revision: 40737 URL: http://svn.opensuse.org/viewcvs/yast?rev=40737&view=rev Log: changed testsuite output Modified: trunk/printer/package/yast2-printer.changes trunk/printer/testsuite/tests/detectPrinters.out trunk/printer/testsuite/tests/detectPrinters.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Sep 3 17:30:44 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 3 17:31:11 CEST 2007 - mzugec(a)suse.cz + +- changed testsuite output + +------------------------------------------------------------------- Mon Sep 3 16:47:22 CEST 2007 - mzugec(a)suse.cz - read URI for usb printers from cups backend if not available Modified: trunk/printer/testsuite/tests/detectPrinters.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPr… ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Mon Sep 3 17:30:44 2007 @@ -1,47 +1,51 @@ Dump --- Detection for lprng Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]] +Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"Parallel", "class_id":265, "dev_name":"/dev/lp0", "device":"BJC-6100", "sub_class_id":0, "unique_key":"xVOt.CRhzf0_Mb88", "vendor":"Canon"], $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Canon", "vendor_db":""]] +Return [$["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"Parallel printer on /dev/lp0", "unique_key":"xVOt.CRhzf0_Mb88", "uri":"parallel:/dev/lp0", "vendor":"Canon", "vendor_db":""], $["device":"BJC-6100", "device_db":"", "info":"Canon BJC-6100", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Canon", "vendor_db":""]] Dump --- Detection for lprng Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] +Read .probe.printer [$["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801]] Read .target.size "/usr/lib/cups/backend/usb" -1 Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] -Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"Epson USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."]] @@ -50,17 +54,19 @@ Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 +Log i $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"Stylus Photo 810", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on //EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb://EPSON/Stylus%20Photo%20810?serial=W33040110201335050", "vendor":"Epson", "vendor_db":""]] +Return [$["device":"Stylus Photo 810", "device_db":"", "info":"Epson Stylus Photo 810", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] Dump --- Detection for cups Execute .target.bash "test -f /etc/init.d/hotplug && (test -d /proc/bus/usb/001 || /etc/init.d/hotplug start)" 0 -Read .probe.printer [$["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]] +Read .probe.printer [$["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"]] Read .target.size "/usr/lib/cups/backend/usb" 555 Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct ptal:/mlc:usb:PSC_2200_Series \"Hewlett-Packard PSC 2200 Series\" \"PTAL mlc:usb:PSC_2200_Series\"\n"] Execute .target.bash "grep '^usblp ' /proc/modules" 0 +Log i $["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"] Read .ppd.db.vendorname "HP" "" Read .ppd.db.modelname ["HP", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"HP", "vendor_db":""]] +Return [$["device":"USB Printer", "device_db":"", "info":"HP USB Printer", "location":"USB printer on ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"HP", "vendor_db":""]] Modified: trunk/printer/testsuite/tests/detectPrinters.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPr… ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.ycp (original) +++ trunk/printer/testsuite/tests/detectPrinters.ycp Mon Sep 3 17:30:44 2007 @@ -104,7 +104,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", @@ -150,7 +150,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", @@ -228,7 +228,7 @@ $[ "bus":"USB", "class_id":265, - "dev_name":"/dev/usblp0", +// "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40736 - /tags/stable-2_15_8/ntp-client/
by kmachalkova＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kmachalkova Date: Mon Sep 3 17:08:45 2007 New Revision: 40736 URL: http://svn.opensuse.org/viewcvs/yast?rev=40736&view=rev Log: Created tag stable-2_15_8 for ntp-client Added: tags/stable-2_15_8/ntp-client/ - copied from r40735, trunk/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40735 - in /trunk/ntp-client: VERSION package/yast2-ntp-client.changes
by kmachalkova＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kmachalkova Date: Mon Sep 3 17:08:39 2007 New Revision: 40735 URL: http://svn.opensuse.org/viewcvs/yast?rev=40735&view=rev Log: version 2.15.8 Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=40735&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Mon Sep 3 17:08:39 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Mon Sep 3 17:08:39 2007 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Mon Sep 3 17:01:12 CEST 2007 - kmachalkova(a)suse.cz + +- Fixed adding new NTP servers when calling ntp-client from outside + (e.g. timezone) - do not re-read the configuration if it has been + already read +- Use error popup (Report::Error) if NTP test fails (#306018) +- Display 'ntpd started on boot' warning message only if we don't + use NM and/or no network device is started at boot time (#299666) +- Do not query status/stop/start NTP service during installation + (holds for NTP test and ntp proposal client) +- Replace 'Finish' button with 'Accept' button in installation + proposal +- 2.15.8 + +------------------------------------------------------------------- Fri Aug 31 17:04:37 CEST 2007 - kmachalkova(a)suse.cz - Move all installation-related functionality into separate inst. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40734 - in /trunk/squid/src: Makefile.am Squid.ycp complex.ycp squid.rnc squid_auto.ycp store_del.ycp
by dfiser＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: dfiser Date: Mon Sep 3 17:08:05 2007 New Revision: 40734 URL: http://svn.opensuse.org/viewcvs/yast?rev=40734&view=rev Log: Added .rnc schema file (bug #304267) - needs verification by Uwe Gansert. Removed some checks of local system if module is running in autoyast (bug #304264). In autoyast Squid module is filled by default values instead of be empty (bug #304264 too). Added: trunk/squid/src/squid.rnc Modified: trunk/squid/src/Makefile.am trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/squid_auto.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40734&… ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Mon Sep 3 17:08:05 2007 @@ -1,6 +1,7 @@ # Makefile.am for squid/src yncludedir = @yncludedir@/squid +rncdir = $(schemadir)/autoyast/rnc client_DATA = \ squid.ycp \ @@ -26,11 +27,13 @@ SquidACL.ycp \ SquidErrorMessages.ycp +rnc_DATA = squid.rnc + # create a symlink for local build, #145327 squid: ln -sf . $@ ycpchook = squid -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40734&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Mon Sep 3 17:08:05 2007 @@ -57,7 +57,7 @@ /** * Is service enabled? */ -boolean service_enabled = false; +boolean service_enabled_on_startup = false; /** @@ -337,6 +337,7 @@ "regexp":"." ] ]; settings = parameters; + service_enabled_on_startup = false; } @@ -375,12 +376,12 @@ /******* SERVICE *******/ global boolean IsServiceEnabled() { - return service_enabled; + return service_enabled_on_startup; } global void SetServiceEnabled(boolean enabled) { - service_enabled = enabled; + service_enabled_on_startup = enabled; } /******* SERVICE END **/ @@ -973,7 +974,7 @@ boolean readServiceStatus() { - service_enabled = Service::Enabled("squid"); + service_enabled_on_startup = Service::Enabled("squid"); return true; } @@ -1037,7 +1038,7 @@ y2debug("Squid::Read - acls: %1", acls); y2debug("Squid::Read - refresh_patterns: %1", refresh_patterns); y2debug("Squid::Read - settings: %1", settings); - y2debug("Squid::Read - enabled: %1", service_enabled); + y2debug("Squid::Read - enabled: %1", service_enabled_on_startup); y2milestone("================ Setting END =================="); /* Error message */ @@ -1317,8 +1318,8 @@ } //enabling / disabling service - if (service_enabled == true) EnableService(); - if (service_enabled == false) DisableService(); + if (service_enabled_on_startup == true) EnableService(); + if (service_enabled_on_startup == false) DisableService(); // start Service if(Abort()) return false; @@ -1347,7 +1348,7 @@ * @return boolean True on success */ global boolean Import (map sett) { - if (sett == $[]){ + if (sett == $[] || sett == nil){ SetDefaultValues(); SetModified(); return true; @@ -1356,7 +1357,8 @@ !haskey(sett, "acls") || !haskey(sett, "http_accesses") || !haskey(sett, "refresh_patterns") || - !haskey(sett, "settings")){ + !haskey(sett, "settings") || + !haskey(sett, "service_enabled_on_startup")){ return false; } @@ -1366,6 +1368,7 @@ http_accesses = (list<map<string,any> >)sett["http_accesses"]:[]; refresh_patterns = (list<map<string,any> >)sett["refresh_patterns"]:[]; settings = (map<string,any>)sett["settings"]:$[]; + service_enabled_on_startup = (boolean)sett["service_enabled_on_startup"]:false; SetModified(); return true; @@ -1381,7 +1384,8 @@ "acls" : acls, "http_accesses" : http_accesses, "refresh_patterns" : refresh_patterns, - "settings" : settings ]; + "settings" : settings, + "service_enabled_on_startup" : service_enabled_on_startup ]; } /** Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40734&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Mon Sep 3 17:08:05 2007 @@ -37,6 +37,7 @@ import "CWMServiceStart"; import "PackageSystem"; import "Squid"; +import "Mode"; include "squid/helps.ycp"; include "squid/dialogs.ycp"; @@ -108,7 +109,7 @@ "start_now_button" : _("&Start Squid Now"), "stop_now_button" : _("S&top Squid Now"), "save_now_action" : SaveAndRestart, - "save_now_button" : _("Sa&ve Settings and Restart Firewall Now"), + "save_now_button" : _("Sa&ve Settings and Restart Squid Now"), //"start_now_action" : uses the default function //"stop_now_action" : uses the default function "help" : sformat (CWMServiceStart::StartStopHelpTemplate (true), @@ -197,7 +198,7 @@ `HSpacing(3), `VBox( "auto_start", - "start_stop" + (Mode::normal() ? "start_stop" : `Empty()) ), `HSpacing(3) ), Added: trunk/squid/src/squid.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.rnc?rev=40734&vi… ============================================================================== --- trunk/squid/src/squid.rnc (added) +++ trunk/squid/src/squid.rnc Mon Sep 3 17:08:05 2007 @@ -0,0 +1,113 @@ +squid = element squid{ + element acls{ + LIST, + element listentry{ + element name{ text }? & + element options{ + LIST, + element option{ text }* + }? & + element type{ text }? + }* + }? & + element http_accesses{ + LIST, + element listentry{ + element acl{ + LIST, + element listentry{ text }* + }? & + element allow{ BOOLEAN }? + }* + }? & + element http_ports{ + LIST, + element listentry{ + element host{ text }? & + element port{ text }? & + element transparent{ BOOLEAN }? + }* + }? & + element refresh_patterns{ + LIST, + element listentry{ + element case_sensitive{ BOOLEAN }? & + element max{ text }? & + element min{ text }? & + element percent{ text }? & + element regexp{ text }? + }* + }? & + element settings{ + LIST, + element access_log{ + LIST, + element listentry{ text }* + }? & + element cache_dir{ + LIST, + element listentry{ text }* + }? & + element cache_log{ + LIST, + element listentry{ text }* + }? & + element cache_mem{ + LIST, + element listentry{ text }* + }? & + element cache_mgr{ + LIST, + element listentry{ text }* + }? & + element cache_replacement_policy{ + LIST, + element listentry{ text }* + }? & + element cache_store_log{ + LIST, + element listentry{ text }* + }? & + element cache_swap_high{ + LIST, + element listentry{ text }* + }? & + element cache_swap_low{ + LIST, + element listentry{ text }* + }? & + element clien_lifetime{ + LIST, + element listentry{ text }* + }? & + element connect_timeout{ + LIST, + element listentry{ text }* + }? & + element emulate_httpd_log{ + LIST, + element listentry{ text }* + }? & + element error_directory{ + LIST, + element listentry{ text }* + }? & + element ftp_passive{ + LIST, + element listentry{ text }* + }? & + element maximum_object_size{ + LIST, + element listentry{ text }* + }? & + element memory_replacement_policy{ + LIST, + element listentry{ text }* + }? & + element minimum_object_size{ + LIST, + element listentry{ text }* + }? + }? & + element service_enabled_on_startup{ BOOLEAN }? +} Modified: trunk/squid/src/squid_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid_auto.ycp?rev=407… ============================================================================== --- trunk/squid/src/squid_auto.ycp (original) +++ trunk/squid/src/squid_auto.ycp Mon Sep 3 17:08:05 2007 @@ -62,6 +62,9 @@ y2debug("func=%1", func); y2debug("param=%1", param); +if (!Squid::GetModified()) + Squid::SetDefaultValues(); + /* Create a summary*/ if(func == "Summary") { ret = select(Squid::Summary(), 0, ""); Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=4073… ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Mon Sep 3 17:08:05 2007 @@ -36,6 +36,7 @@ import "FileUtils"; import "Popup"; import "FileUtils"; +import "Mode"; import "Squid"; import "SquidACL"; @@ -163,7 +164,7 @@ if (size(cache_dir) == 0){ ok = false; Report::Error(_("Cache directory must not be empty.")); - }else if (!FileUtils::CheckAndCreatePath(cache_dir)){ + }else if (Mode::normal() && !FileUtils::CheckAndCreatePath(cache_dir)){ ok = false; }else{ integer cache_mem = (integer)UI::QueryWidget(`id("cache_mem"), `Value) * @@ -415,15 +416,15 @@ ok = false; message = message + (size(message)>0 ? "\n" : "") + _("Cache Log must not be empty."); } - if (size(access_log) > 0 && !isCorrectPathnameOfLogFile(access_log)){ + if (size(access_log) > 0 && Mode::normal() && !isCorrectPathnameOfLogFile(access_log)){ ok = false; message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Access Log field."); } - if (size(cache_log) > 0 && !isCorrectPathnameOfLogFile(cache_log)){ + if (size(cache_log) > 0 && Mode::normal() && !isCorrectPathnameOfLogFile(cache_log)){ ok = false; message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Log field."); } - if (size(cache_store_log) > 0 && !isCorrectPathnameOfLogFile(cache_store_log)){ + if (size(cache_store_log) > 0 && Mode::normal() && !isCorrectPathnameOfLogFile(cache_store_log)){ ok = false; message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Store Log field."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40733 - /tags/stable-2_15_16/autoinstallation/
by ug＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: ug Date: Mon Sep 3 17:06:52 2007 New Revision: 40733 URL: http://svn.opensuse.org/viewcvs/yast?rev=40733&view=rev Log: Created tag stable-2_15_16 for autoinstallation Added: tags/stable-2_15_16/autoinstallation/ - copied from r40732, trunk/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40732 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/clients/inst_autosetup.ycp
by ug＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: ug Date: Mon Sep 3 17:05:50 2007 New Revision: 40732 URL: http://svn.opensuse.org/viewcvs/yast?rev=40732&view=rev Log: added LanUdevAuto::Import for networking udev configuration (#303916). 2.15.16 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=407… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Mon Sep 3 17:05:50 2007 @@ -1 +1 @@ -2.15.15 +2.15.16 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Sep 3 17:05:50 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 17:03:56 CEST 2007 - ug(a)suse.de + +- added LanUdevAuto::Import for networking udev configuration + (#303916) +- 2.15.16 + +------------------------------------------------------------------- Mon Sep 3 16:07:03 CEST 2007 - ug(a)suse.de - commandline options fixed (#269887) Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Mon Sep 3 17:05:50 2007 @@ -33,6 +33,7 @@ import "Keyboard"; import "Call"; import "ProductControl"; + import "LanUdevAuto"; include "bootloader/routines/autoinstall.ycp"; include "autoinstall/ask.ycp"; @@ -224,6 +225,8 @@ y2debug ("autoyast: Proposing done"); + LanUdevAuto::Import(Profile::current["networking"]:$[]); + Progress::NextStage(); string rl = Profile::current["runlevel", "default"]:""; y2milestone("autoyast - configured runlevel: %1", rl); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40731 - /tags/stable-2_15_7/tune/
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 17:05:13 2007 New Revision: 40731 URL: http://svn.opensuse.org/viewcvs/yast?rev=40731&view=rev Log: Created tag stable-2_15_7 for tune Added: tags/stable-2_15_7/tune/ - copied from r40730, trunk/tune/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40730 - in /trunk/tune/hwinfo/src: newid.ycp system_settings_dialogs.ycp
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 17:04:49 2007 New Revision: 40730 URL: http://svn.opensuse.org/viewcvs/yast?rev=40730&view=rev Log: Some more Disable::BackButton()s Modified: trunk/tune/hwinfo/src/newid.ycp trunk/tune/hwinfo/src/system_settings_dialogs.ycp Modified: trunk/tune/hwinfo/src/newid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/newid.ycp?rev=40… ============================================================================== --- trunk/tune/hwinfo/src/newid.ycp (original) +++ trunk/tune/hwinfo/src/newid.ycp Mon Sep 3 17:04:49 2007 @@ -375,6 +375,7 @@ } define void InitNewPCIIDDialog (string id) { + Wizard::DisableBackButton(); y2milestone("Init: %1", id); list items = get_table_items(); UI::ChangeWidget(`id(`newid_table), `Items, items); @@ -497,9 +498,7 @@ NewPCIIDDialogHelp(), true, true ); - - // remove Back button - workflow has only one dialog - Wizard::HideAbortButton(); + Wizard::DisableBackButton(); Wizard::SetNextButton(`next, Label::OKButton()); InitNewPCIIDDialog("pci_id_table_and_buttons"); Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_… ============================================================================== --- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original) +++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Mon Sep 3 17:04:49 2007 @@ -198,6 +198,7 @@ Wizard::SetContentsButtons("", `VBox (), "", Label::BackButton(), Label::NextButton()); + Wizard::DisableBackButton(); Wizard::SetDesktopIcon("powertweak"); // bugzilla #237379 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40729 - /tags/stable-2_15_46/installation/
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 16:50:22 2007 New Revision: 40729 URL: http://svn.opensuse.org/viewcvs/yast?rev=40729&view=rev Log: Created tag stable-2_15_46 for installation Added: tags/stable-2_15_46/installation/ - copied from r40728, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40728 - /tags/stable-2_15_74/packager/
by locilka＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: locilka Date: Mon Sep 3 16:49:52 2007 New Revision: 40728 URL: http://svn.opensuse.org/viewcvs/yast?rev=40728&view=rev Log: Created tag stable-2_15_74 for packager Added: tags/stable-2_15_74/packager/ - copied from r40727, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0