September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41037 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 24 Sep '07

24 Sep '07

Author: lslezak Date: Mon Sep 24 09:20:05 2007 New Revision: 41037 URL: http://svn.opensuse.org/viewcvs/yast?rev=41037&view=rev Log: - search the correct package instance in license bindings (Pkg::PkgGetLicenseToConfirm(), Pkg::PkgGetLicensesToConfirm() and Pkg::PkgMarkLicenseConfirmed()) - fixes the double license confirmation bug (#326277) - 2.15.50 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=41037&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Mon Sep 24 09:20:05 2007 @@ -1 +1 @@ -2.15.49 +2.15.50 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Sep 24 09:20:05 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Sep 24 09:02:57 CEST 2007 - lslezak(a)suse.cz + +- search the correct package instance in license bindings + (Pkg::PkgGetLicenseToConfirm(), Pkg::PkgGetLicensesToConfirm() + and Pkg::PkgMarkLicenseConfirmed()) - fixes the double license + confirmation bug (#326277) +- 2.15.50 + +------------------------------------------------------------------- Mon Sep 3 13:01:12 CEST 2007 - lslezak(a)suse.cz - reimplemented media redirection in media change callback Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Mon Sep 24 09:20:05 2007 @@ -2419,23 +2419,21 @@ { try { - // find the uninstalled (!) package - zypp::ResPool::byName_iterator it = std::find_if ( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - if (it != zypp_ptr()->pool().byNameEnd(pkgname) && !it->status().isLicenceConfirmed()) + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); + ++it) { - // cast to Package object + // is it a package? zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - // get the license - zypp::License license = package->licenseToConfirm(); - return YCPString(license); + // a package scheduled for installation, with unconfirmed license, not installed yet + if (package && it->status().isToBeInstalled() && !it->status().isLicenceConfirmed() + && !it->status().isInstalled()) + { + // get the license + zypp::License license = package->licenseToConfirm(); + return YCPString(license); + } } } catch (...) @@ -2462,38 +2460,12 @@ YCPMap ret; for ( int i = 0; i < packages->size(); ++i ) { - std::string pkgname = packages->value(i)->asString()->value(); + YCPString license = PkgGetLicenseToConfirm(packages->value(i)->asString()); - if (!pkgname.empty()) + // found a license to confirm? + if (!license->value().empty()) { - try - { - // find the uninstalled (!) package - zypp::ResPool::byName_iterator it = std::find_if( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - // found a package? - if (it != zypp_ptr()->pool().byNameEnd(pkgname)) - { - // cast to Package object - zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); - zypp::License license = package->licenseToConfirm(); - - // has the license already been confirmed? - if (!license.empty() && !it->status().isLicenceConfirmed()) - { - ret->add(packages->value(i), YCPString(license)); - } - } - } - catch (...) - { - } + ret->add(packages->value(i), license); } } @@ -2507,7 +2479,6 @@ @param string name of a package @return boolean true if the license has been successfuly confirmed */ -#warning This is bogus, as we have multiple matching packages YCPBoolean PkgModuleFunctions::PkgMarkLicenseConfirmed (const YCPString & package) { std::string pkgname = package->value(); @@ -2516,20 +2487,21 @@ { try { - // find the package - zypp::ResPool::byName_iterator it = std::find_if( - zypp_ptr()->pool().byNameBegin(pkgname) - , zypp_ptr()->pool().byNameEnd(pkgname) - , zypp::functor::chain( - zypp::resfilter::ByUninstalled (), - zypp::resfilter::ByKind( zypp::ResTraits<zypp::Package>::kind ) ) - ); - - if (it != zypp_ptr()->pool().byNameEnd(pkgname)) + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); + ++it) { - // confirm the license - it->status().setLicenceConfirmed(true); - return YCPBoolean( true ); + // is it a package? + zypp::Package::constPtr package = zypp::dynamic_pointer_cast<const zypp::Package>(it->resolvable()); + + // a package scheduled for installation, with unconfirmed license, not installed yet + if (package && it->status().isToBeInstalled() && !it->status().isLicenceConfirmed() + && !it->status().isInstalled()) + { + // confirm the license + it->status().setLicenceConfirmed(true); + return YCPBoolean( true ); + } } } catch (...) -- 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] r41036 - /tags/stable-2_15_6/printer/
by mzugec＠svn.opensuse.org 24 Sep '07

24 Sep '07

Author: mzugec Date: Mon Sep 24 09:04:35 2007 New Revision: 41036 URL: http://svn.opensuse.org/viewcvs/yast?rev=41036&view=rev Log: Created tag stable-2_15_6 for printer Added: tags/stable-2_15_6/printer/ - copied from r41035, trunk/printer/ -- 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] r41035 - in /trunk/printer: VERSION package/yast2-printer.changes src/modules/Printer.ycp src/modules/Printerlib.ycp testsuite/tests/detectPrinters.out testsuite/tests/detectPrinters.ycp
by mzugec＠svn.opensuse.org 24 Sep '07

24 Sep '07

Author: mzugec Date: Mon Sep 24 09:01:33 2007 New Revision: 41035 URL: http://svn.opensuse.org/viewcvs/yast?rev=41035&view=rev Log: reverted last submit (back to 2.15.4 status) (#326319) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printer.ycp trunk/printer/src/modules/Printerlib.ycp trunk/printer/testsuite/tests/detectPrinters.out trunk/printer/testsuite/tests/detectPrinters.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41035&r1=410… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Sep 24 09:01:33 2007 @@ -1 +1 @@ -2.15.5 +2.15.6 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 24 09:01:33 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 24 09:00:43 CEST 2007 - mzugec(a)suse.cz + +- reverted last submit (back to 2.15.4 status) (#326319) + +------------------------------------------------------------------- Mon Sep 3 17:31:11 CEST 2007 - mzugec(a)suse.cz - changed testsuite output Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Sep 24 09:01:33 2007 @@ -349,15 +349,13 @@ if (Spooler::Get () == "cups") { - dev_name = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; - if ((dev_name == nil || dev_name == "")||(class_dev == nil || class_dev == "")){ - dev_name = Printerlib::GetCupsUsbDevicesInfo()[0,0]:""; - } - else { - dev_name = class_dev; - } + dev_name + = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; + if (dev_name == nil || dev_name == "") + { + 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.y… ============================================================================== --- trunk/printer/src/modules/Printerlib.ycp (original) +++ trunk/printer/src/modules/Printerlib.ycp Mon Sep 24 09:01:33 2007 @@ -125,9 +125,7 @@ * 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/detectPr… ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Mon Sep 24 09:01:33 2007 @@ -1,6 +1,6 @@ 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, "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, "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 .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" @@ -8,10 +8,10 @@ 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 ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "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 /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "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, "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, "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 .target.size "/usr/lib/cups/backend/usb" -1 Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" @@ -19,29 +19,29 @@ 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 ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "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 /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "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, "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, "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 .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\" > ; 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\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 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 ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] +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":""]] 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, "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, "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 .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\" > ; 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\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 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 ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"Epson", "vendor_db":""]] +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":""]] 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."]] @@ -53,14 +53,14 @@ 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 /dev/usblp0", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:/dev/usblp0", "vendor":"Epson", "vendor_db":""]] +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":""]] 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, "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, "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 .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 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 ", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "uri":"usb:", "vendor":"HP", "vendor_db":""]] +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":""]] 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 24 09:01:33 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] r41034 - /tags/stable-2_15_38/users/
by jsuchome＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: jsuchome Date: Fri Sep 21 16:56:22 2007 New Revision: 41034 URL: http://svn.opensuse.org/viewcvs/yast?rev=41034&view=rev Log: Created tag stable-2_15_38 for users Added: tags/stable-2_15_38/users/ - copied from r41033, trunk/users/ -- 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] r41033 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm
by jsuchome＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: jsuchome Date: Fri Sep 21 16:56:16 2007 New Revision: 41033 URL: http://svn.opensuse.org/viewcvs/yast?rev=41033&view=rev Log: - enable cryted directories for new users (#326794) - 2.15.38 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=41033&r1=41032… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Sep 21 16:56:16 2007 @@ -1 +1 @@ -2.15.36 +2.15.38 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Sep 21 16:56:16 2007 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 21 15:08:40 CEST 2007 - jsuchome(a)suse.cz + +- enable cryted directories for new users (#326794) +- 2.15.38 + +------------------------------------------------------------------- +Tue Aug 21 16:45:00 CEST 2007 - jsuchome(a)suse.cz + +- testsuite is back (removed in 2.13.24) +- added UsersPasswd::SetBaseDirectory (called from testsuite) +- 2.15.37 + +------------------------------------------------------------------- Fri Aug 17 10:45:29 CEST 2007 - jsuchome(a)suse.cz - use Perl built-ins instead of SCR (patch by locilka, #266179) Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=41033&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Sep 21 16:56:16 2007 @@ -3413,8 +3413,8 @@ my $new_pw = $user->{"text_userpassword"}; return 0 if ($home_size == 0 && $org_size == 0); # nothing to do + return 0 if (!defined $pw && !defined $new_pw); # no change without password provided :-( return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw); - return 0 if !defined $pw; # no change without password provided :-( return 1; } @@ -6171,7 +6171,7 @@ # remove cache entries (#50265) UsersCache->ResetCache (); - my $error_msg = $self->ReadLocal (); + my $error_msg = Mode->test () ? "" : $self->ReadLocal (); if ($error_msg) { return 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] r41032 - in /trunk/installation: package/yast2-installation.changes src/clients/umount_finish.ycp
by locilka＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: locilka Date: Fri Sep 21 16:44:45 2007 New Revision: 41032 URL: http://svn.opensuse.org/viewcvs/yast?rev=41032&view=rev Log: Do not kill dhcpcd -- because of possibly used NFS sources Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/umount_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Sep 21 16:44:45 2007 @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Fri Sep 21 16:35:18 CEST 2007 - locilka(a)suse.cz -- Start dhcpcd using WFM instead of SCR. -- Kill dhcpcd at the end of the installation (both #326342). +- Start dhcpcd using WFM instead of SCR (#326342). - 2.15.53 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/umount_… ============================================================================== --- trunk/installation/src/clients/umount_finish.ycp (original) +++ trunk/installation/src/clients/umount_finish.ycp Fri Sep 21 16:44:45 2007 @@ -127,8 +127,6 @@ // fallback // bugzilla #326478 if (umount_status != true) { - WFM::Execute (.local.bash_output, "killall dhcpcd"); - y2warning ("Umount failed, trying to remount read only..."); string cmd = sformat ("mount -o remount,ro '%1'; umount --force '%1';", String::Quote (tmp)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); -- 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] r41031 - /tags/stable-2_15_53/installation/
by locilka＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: locilka Date: Fri Sep 21 16:40:20 2007 New Revision: 41031 URL: http://svn.opensuse.org/viewcvs/yast?rev=41031&view=rev Log: Created tag stable-2_15_53 for installation Added: tags/stable-2_15_53/installation/ - copied from r41030, 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] r41030 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_network_setup.ycp src/clients/umount_finish.ycp
by locilka＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: locilka Date: Fri Sep 21 16:39:39 2007 New Revision: 41030 URL: http://svn.opensuse.org/viewcvs/yast?rev=41030&view=rev Log: - Start dhcpcd using WFM instead of SCR. - Kill dhcpcd at the end of the installation (both #326342). - 2.15.53 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/umount_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=41030&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Sep 21 16:39:39 2007 @@ -1 +1 @@ -2.15.52 +2.15.53 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Sep 21 16:39:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 21 16:35:18 CEST 2007 - locilka(a)suse.cz + +- Start dhcpcd using WFM instead of SCR. +- Kill dhcpcd at the end of the installation (both #326342). +- 2.15.53 + +------------------------------------------------------------------- Fri Sep 21 09:53:37 CEST 2007 - locilka(a)suse.cz - When normal umount at the end of the installation fails, try Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Fri Sep 21 16:39:39 2007 @@ -754,7 +754,7 @@ FlushAllIPSettings(); string cmd = sformat ("/sbin/dhcpcd '%1'", String::Quote (network_settings["network_device"]:"")); - map run_cmd = (map) SCR::Execute (.target.bash_output, cmd); + map run_cmd = (map) WFM::Execute (.local.bash_output, cmd); y2milestone ("Running %1 returned %2", cmd, run_cmd); if (run_cmd["exit"]:-1 != 0) { Modified: trunk/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/umount_… ============================================================================== --- trunk/installation/src/clients/umount_finish.ycp (original) +++ trunk/installation/src/clients/umount_finish.ycp Fri Sep 21 16:39:39 2007 @@ -127,6 +127,8 @@ // fallback // bugzilla #326478 if (umount_status != true) { + WFM::Execute (.local.bash_output, "killall dhcpcd"); + y2warning ("Umount failed, trying to remount read only..."); string cmd = sformat ("mount -o remount,ro '%1'; umount --force '%1';", String::Quote (tmp)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); -- 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] r41029 - /tags/stable-2_15_25/bootloader/
by odabrunz＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: odabrunz Date: Fri Sep 21 16:20:09 2007 New Revision: 41029 URL: http://svn.opensuse.org/viewcvs/yast?rev=41029&view=rev Log: Created tag stable-2_15_25 for bootloader Added: tags/stable-2_15_25/bootloader/ - copied from r41028, trunk/bootloader/ -- 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] r41028 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by odabrunz＠svn.opensuse.org 21 Sep '07

21 Sep '07

Author: odabrunz Date: Fri Sep 21 16:19:48 2007 New Revision: 41028 URL: http://svn.opensuse.org/viewcvs/yast?rev=41028&view=rev Log: - updated changes file - 2.15.25 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=41028&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Sep 21 16:19:48 2007 @@ -1 +1 @@ -2.15.24 +2.15.25 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Sep 21 16:19:48 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Sep 21 16:19:02 CEST 2007 - od(a)suse.de + +- run delayed bootloader_entry at the very end of the update, when + the migrated bootloader configuration (including device mapping) + has already been written (#309837) +- added some comments +- 2.15.25 + +------------------------------------------------------------------- Thu Sep 20 21:00:14 CEST 2007 - od(a)suse.de - log the contents of the perl-BL_delayed_exec script (#309837) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0