Author: mzugec Date: Mon Sep 3 17:43:19 2007 New Revision: 40738 URL: http://svn.opensuse.org/viewcvs/yast?rev=40738&view=rev Log: changed testsuite output Modified: trunk/printer/src/modules/Printer.ycp trunk/printer/src/modules/Printerlib.ycp trunk/printer/testsuite/tests/detectPrinters.out Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?rev=40738&r1=40737&r2=40738&view=diff ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Sep 3 17:43:19 2007 @@ -357,6 +357,7 @@ dev_name = class_dev; } } + if (dev_name==nil) dev_name=""; p = $[ "vendor" : i["sub_vendor"]:i["vendor"]:"", "device" : i["sub_device"]:i["device"]:"", Modified: trunk/printer/src/modules/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printerlib.ycp?rev=40738&r1=40737&r2=40738&view=diff ============================================================================== --- trunk/printer/src/modules/Printerlib.ycp (original) +++ trunk/printer/src/modules/Printerlib.ycp Mon Sep 3 17:43:19 2007 @@ -125,7 +125,9 @@ * UNIX-like device */ global list<string> GetCupsUsbDeviceInfo (string device) { + if (device=="") return []; integer pos = search(device, "lp"); + if (pos==nil) return []; string dev_num = substring (device, pos + 2); list<string> ret = []; if (dev_num != "") Modified: trunk/printer/testsuite/tests/detectPrinters.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPrinters.out?rev=40738&r1=40737&r2=40738&view=diff ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Mon Sep 3 17:43:19 2007 @@ -5,7 +5,6 @@ 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 @@ -17,7 +16,6 @@ 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 @@ -29,7 +27,6 @@ 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\" > ; 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 @@ -41,7 +38,6 @@ 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\" > ; 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 @@ -54,7 +50,6 @@ 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 @@ -65,7 +60,6 @@ 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 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org