October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52685 - in /trunk/storage/libstorage/src: Loop.cc LoopCo.cc
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:34:35 2008 New Revision: 52685 URL: http://svn.opensuse.org/viewcvs/yast?rev=52685&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LoopCo.cc Modified: trunk/storage/libstorage/src/Loop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Loop.cc (original) +++ trunk/storage/libstorage/src/Loop.cc Wed Oct 29 16:34:35 2008 @@ -18,15 +18,16 @@ using namespace storage; using namespace std; -Loop::Loop( const LoopCo& d, const string& LoopDev, const string& LoopFile, - bool dmcrypt, const string& dm_dev, - ProcPart& ppart, SystemCmd& losetup ) : - Volume( d, 0, 0 ) - { - y2milestone( "constructed loop dev:%s file:%s dmcrypt:%d dmdev:%s", - LoopDev.c_str(), LoopFile.c_str(), dmcrypt, dm_dev.c_str() ); + +Loop::Loop(const LoopCo& d, const string& LoopDev, const string& LoopFile, + bool dmcrypt, const string& dm_dev, ProcPart& ppart, + SystemCmd& losetup) + : Volume(d, 0, 0) +{ + y2mil("constructed loop dev:" << LoopDev << " file:" << LoopFile << + " dmcrypt:" << dmcrypt << " dmdev:" << dm_dev); if( d.type() != LOOP ) - y2error( "constructed loop with wrong container" ); + y2err("constructed loop with wrong container"); init(); lfile = LoopFile; loop_dev = fstab_loop_dev = LoopDev; @@ -73,15 +74,17 @@ if( stat( lfile.c_str(), &st )>=0 ) setSize( st.st_size/1024 ); } - } +} -Loop::Loop( const LoopCo& d, const string& file, bool reuseExisting, - unsigned long long sizeK, bool dmcr ) : Volume( d, 0, 0 ) - { - y2milestone( "constructed loop file:%s reuseExisting:%d sizek:%llu dmcrypt:%d", - file.c_str(), reuseExisting, sizeK, dmcr ); + +Loop::Loop(const LoopCo& d, const string& file, bool reuseExisting, + unsigned long long sizeK, bool dmcr) + : Volume(d, 0, 0) +{ + y2mil("constructed loop file:" << file << " reuseExisting:" << reuseExisting << + " sizek:" << sizeK << " dmcrypt:" << dmcr); if( d.type() != LOOP ) - y2error( "constructed loop with wrong container" ); + y2err("constructed loop with wrong container"); init(); reuseFile = reuseExisting; lfile = file; @@ -107,12 +110,14 @@ checkReuse(); if( !reuseFile ) setSize( sizeK ); - } +} + Loop::~Loop() - { - y2debug( "destructed loop %s", dev.c_str() ); - } +{ + y2deb("destructed loop " << dev); +} + void Loop::init() @@ -191,7 +196,7 @@ return( ret ); } -string +string Loop::lfileRealPath() const { return( cont->getStorage()->root() + lfile ); @@ -281,7 +286,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Create file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } else @@ -292,7 +297,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } } @@ -320,7 +325,7 @@ // %3$s is replaced by size (e.g. 623.5 MB) // %4$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Formatting file-based device %1$s of %2$s (%3$s) with %4$s "), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } else @@ -338,7 +343,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Format file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } else @@ -349,7 +354,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } } @@ -360,7 +365,7 @@ // %3$s is replaced by size (e.g. 623.5 MB) // %4$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Format file-based device %1$s of %2$s (%3$s) with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } } @@ -395,7 +400,7 @@ bool Loop::equalContent( const Loop& rhs ) const { return( Volume::equalContent(rhs) && - lfile==rhs.lfile && reuseFile==rhs.reuseFile && + lfile==rhs.lfile && reuseFile==rhs.reuseFile && delFile==rhs.delFile ); } @@ -421,21 +426,24 @@ y2mil(log); } -Loop& Loop::operator= ( const Loop& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); + +Loop& Loop::operator=(const Loop& rhs) +{ + y2deb("operator= from " << rhs.nm); *((Volume*)this) = rhs; lfile = rhs.lfile; reuseFile = rhs.reuseFile; delFile = rhs.delFile; - return( *this ); - } + return *this; +} -Loop::Loop( const LoopCo& d, const Loop& rhs ) : Volume(d) - { - y2debug( "constructed loop by copy constructor from %s", rhs.nm.c_str() ); + +Loop::Loop(const LoopCo& d, const Loop& rhs) + : Volume(d) +{ + y2deb("constructed loop by copy constructor from " << rhs.nm); *this = rhs; - } +} -unsigned Loop::loop_major = 0; +unsigned Loop::loop_major = 0; Modified: trunk/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.cc (original) +++ trunk/storage/libstorage/src/LoopCo.cc Wed Oct 29 16:34:35 2008 @@ -18,26 +18,30 @@ using namespace storage; using namespace std; -LoopCo::LoopCo( Storage * const s, bool detect, ProcPart& ppart ) : - Container(s,"loop",staticType()) - { - y2debug( "constructing LoopCo detect:%d", detect ); + +LoopCo::LoopCo(Storage * const s, bool detect, ProcPart& ppart) + : Container(s, "loop", staticType()) +{ + y2deb("constructing LoopCo detect:" << detect); init(); if( detect ) getLoopData( ppart ); - } +} -LoopCo::LoopCo( Storage * const s, const string& file ) : - Container(s,"loop",staticType()) - { - y2debug( "constructing LoopCo file:%s", file.c_str() ); + +LoopCo::LoopCo(Storage * const s, const string& file) + : Container(s, "loop", staticType()) +{ + y2deb("constructing LoopCo file:" << file); init(); - } +} + LoopCo::~LoopCo() - { - y2debug( "destructed LoopCo" ); - } +{ + y2deb("destructed LoopCo"); +} + void LoopCo::init() @@ -68,7 +72,7 @@ y2warning( "file %s not existent or special", lfile.c_str() ); else { - Loop *l = new Loop( *this, i->loop_dev, lfile, + Loop *l = new Loop( *this, i->loop_dev, lfile, i->dmcrypt, !i->noauto?i->dentry:"", ppart, c ); l->setEncryption( i->encr ); @@ -92,10 +96,10 @@ { getStorage()->findDmUsing( i->loopDevice(), dm ); } - if( dm==0 && !i->getMount().empty() && + if( dm==0 && !i->getMount().empty() && !mp[i->getMount()].empty() ) { - y2mil( "mp:" << i->getMount() << " dev:" << + y2mil( "mp:" << i->getMount() << " dev:" << mp[i->getMount()] ); getStorage()->findDm( mp[i->getMount()], dm ); } @@ -197,11 +201,11 @@ } int -LoopCo::updateLoop( const string& device, const string& file, +LoopCo::updateLoop( const string& device, const string& file, bool reuseExisting, unsigned long long sizeK ) { int ret = 0; - y2milestone( "device:%s file:%s reuse:%d sizeK:%lld", device.c_str(), + y2milestone( "device:%s file:%s reuse:%d sizeK:%lld", device.c_str(), file.c_str(), reuseExisting, sizeK ); LoopIter i; if( readonly() ) @@ -409,16 +413,16 @@ return( ret ); } -LoopCo::LoopCo( const LoopCo& rhs ) : Container(rhs) - { - y2debug( "constructed LoopCo by copy constructor from %s", rhs.nm.c_str() ); + +LoopCo::LoopCo(const LoopCo& rhs) + : Container(rhs) +{ + y2deb("constructed LoopCo by copy constructor from " << rhs.nm); *this = rhs; ConstLoopPair p = rhs.loopPair(); for( ConstLoopIter i=p.begin(); i!=p.end(); ++i ) - { - Loop * p = new Loop( *this, *i ); - vols.push_back( p ); - } + { + Loop * p = new Loop( *this, *i ); + vols.push_back( p ); } - - +} -- 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] r52684 - /trunk/storage/storage/src/include/ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:19:55 2008 New Revision: 52684 URL: http://svn.opensuse.org/viewcvs/yast?rev=52684&view=rev Log: - fixed syntax Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 29 16:19:55 2008 @@ -136,7 +136,7 @@ { // error popup Popup::Error(sformat(_("It is not possible to create a partition on %1."), - disk_device); + disk_device)); } y2milestone("ret %1", ret); -- 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] r52683 - in /trunk/storage/storage/src: include/ep-hd-dialogs.ycp include/ep-hd-lib.ycp modules/Region.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:18:26 2008 New Revision: 52683 URL: http://svn.opensuse.org/viewcvs/yast?rev=52683&view=rev Log: - tiny improvements Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/modules/Region.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Oct 29 16:18:26 2008 @@ -126,9 +126,11 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, cyl_count, region[0]:0)), - `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 1, cyl_count, region[1]:0)) + _("Start Cylinder"), 0, cyl_count, + Region::Start(region))), + `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), + _("End Cylinder"), 0, cyl_count, + Region::End(region))) )) ) ) @@ -180,6 +182,7 @@ Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); widget = `again; + continue; } else if (size_k < min_size_k || size_k > max_size_k) { @@ -188,16 +191,18 @@ Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; + continue; } break; } case `manual_region: { - region = [ (integer) UI::QueryWidget(`id(`start_cyl), `Value), - (integer) UI::QueryWidget(`id(`num_cyls), `Value) ]; + integer s = (integer) UI::QueryWidget(`id(`start_cyl), `Value); + integer e = (integer) UI::QueryWidget(`id(`end_cyl), `Value); + region = [ s, e - s + 1 ]; - boolean valid = find(list<integer> slot, slots, { + boolean valid = Region::Length(region) > 0 && find(list<integer> slot, slots, { return Region::Inside(slot, region); }) != nil; @@ -206,6 +211,7 @@ // error popup Popup::Error(_("The region entered is invalid.")); widget = `again; + continue; } break; Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 29 16:18:26 2008 @@ -135,8 +135,8 @@ if (size(ret) == 0) { // error popup - string text = sformat(_("It is not possible to create a partition on %1."), disk_device); - Popup::Warning(text); + Popup::Error(sformat(_("It is not possible to create a partition on %1."), + disk_device); } y2milestone("ret %1", ret); Modified: trunk/storage/storage/src/modules/Region.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Regi… ============================================================================== --- trunk/storage/storage/src/modules/Region.ycp (original) +++ trunk/storage/storage/src/modules/Region.ycp Wed Oct 29 16:18:26 2008 @@ -11,19 +11,19 @@ module "Region"; - integer Start(list<integer> a) + global integer Start(list<integer> a) { return a[0]:0; } - integer Length(list<integer> a) + global integer Length(list<integer> a) { return a[1]:0; } - integer End(list<integer> a) + global integer End(list<integer> a) { return a[0]:0 + a[1]:0 - 1; } -- 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] r52682 - /tags/stable-2_17_28/printer/
by jsmeix＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsmeix Date: Wed Oct 29 16:07:25 2008 New Revision: 52682 URL: http://svn.opensuse.org/viewcvs/yast?rev=52682&view=rev Log: Created tag stable-2_17_28 for printer Added: tags/stable-2_17_28/printer/ - copied from r52681, 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] r52681 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printerlib.ycp src/autoconfig.ycp
by jsmeix＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsmeix Date: Wed Oct 29 16:07:17 2008 New Revision: 52681 URL: http://svn.opensuse.org/viewcvs/yast?rev=52681&view=rev Log: - Added functionality to remove the cups-autoconfig RPM in the Autoconfig Settings dialog. - 2.17.28 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printerlib.ycp trunk/printer/src/autoconfig.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52681&r1=526… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Oct 29 16:07:17 2008 @@ -1 +1 @@ -2.17.27 +2.17.28 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 Wed Oct 29 16:07:17 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Oct 29 15:56:32 CET 2008 - jsmeix(a)suse.de + +- Added a AskForExistingFile popup dialog in the Add Driver + dialog to browse the file system to select a PPD file. +- Added functionality to remove the cups-autoconfig RPM + in the Autoconfig Settings dialog. +- 2.17.28 + +------------------------------------------------------------------- Fri Oct 24 12:03:52 CEST 2008 - jsmeix(a)suse.de - Fixed some bugs in the Add Driver dialog. Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=5… ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Wed Oct 29 16:07:17 2008 @@ -92,24 +92,24 @@ // but I am only interested in real package names here. if( "installed" == action ) { if( ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "package '%1' is installed", result["stdout"]:package_name ); + { y2milestone( "TestAndInstallPackage: package '%1' is installed", result["stdout"]:package_name ); return true; } // The "%1" makes the YCP Parser happy, otherwise it shows the warning // "Format string is not constant, no parameter checking possible". - y2milestone( "%1", result["stdout"]:"package is not installed" ); + y2milestone( "TestAndInstallPackage: %1", result["stdout"]:"TestAndInstallPackage: package is not installed" ); return false; } if( "install" == action ) { if( ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "package '%1' is already installed", result["stdout"]:package_name ); + { y2milestone( "TestAndInstallPackage: package '%1' is already installed", result["stdout"]:package_name ); return true; } // Is the package available to be installed? // Package::Available returns nil if no package source is available. boolean package_available = Package::Available( package_name ); if( nil == package_available ) - { y2milestone( "Required package %1 is not installed and there is no package repository available.", package_name ); + { y2milestone( "TestAndInstallPackage: Required package %1 is not installed and there is no package repository available.", package_name ); Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name: _("Required package %1 is not installed and there is no package repository available."), package_name @@ -118,7 +118,7 @@ return false; } if( ! package_available ) - { y2milestone( "Required package %1 is not installed and not available in the repository.", package_name ); + { y2milestone( "TestAndInstallPackage: Required package %1 is not installed and not available in the repository.", package_name ); Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name: _("Required package %1 is not installed and not available in the repository."), package_name @@ -127,7 +127,7 @@ return false; } if( ! Package::Install( package_name ) ) - { y2milestone( "Failed to install required package %1.", package_name ); + { y2milestone( "TestAndInstallPackage: Failed to install required package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: // Either the user has explicitely rejected to install the package, @@ -142,11 +142,11 @@ } if( "remove" == action ) { if( ! ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "skip remove because %1", result["stdout"]:"package is not installed" ); + { y2milestone( "TestAndInstallPackage: skip remove because %1", result["stdout"]:"package is not installed" ); return true; } if( ! Package::Remove( package_name ) ) - { y2milestone( "Failed to remove package %1.", package_name ); + { y2milestone( "TestAndInstallPackage: Failed to remove package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: // Either the user has explicitely rejected to remove the package, Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=5… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Wed Oct 29 16:07:17 2008 @@ -36,6 +36,7 @@ include "printer/helps.ycp"; +boolean autoconfig_settings_dialog_is_useless = false; // By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": boolean initial_cups_autoconfig_ConfigureNewPrinters = true; // By default the DisablePrintersOnRemoval value in /etc/cups-autoconfig.conf is set to "no": @@ -52,47 +53,77 @@ _("Specify in which way USB printers are configured automatically") ) ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_configure_new_attachend"), - // CheckBox to enable that a print queue is automatically created - // when a USB printer is connected for the first time to the USB: - _("Enable &Automatic Configuration of New Attachend USB Printers") - ) - ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_disable_on_removal"), - // CheckBox to disable the print queue - // when a USB printer is disconnected from the USB: - _("&Disable Printout when Disconnecting an USB Printer") - ) - ), - `Left - ( `ComboBox - ( `id("cups_autoconfig_operation_policy"), - // Header for a ComboBox to specify the CUPS operation policy - // for print queues which are automatically created - // when a USB printer is connected for the first time to the USB: - _("Operation &Policy for Automatically Configured USB Printers"), - [""] + // Have space between the header and the choices: + `VSpacing( 1 ), + `HBox + ( `HSpacing( 3 ), + `VBox + ( `Left + ( `CheckBox + ( // Use a CheckBox to remove the cups-autoconfig RPM package + // instead of a RadioButton because this is the only RadioButton + // because there is no RadioButton to install cups-autoconfig + // because initAutoconfig checks if cups-autoconfig is installed + // and if not it tries to install it. + `id("cups_autoconfig_remove"), + // CheckBox to have no automatic configuration of USB printers at all + // by removing the cups-autoconfig RPM package. + // Do not change or translate "cups-autoconfig", it is a RPM package name. + _("No Automatic Configuration at all: &Remove the cups-autoconfig package.") + ) + ), + // Have space between the choice "No Automatic Configuration at all" + // and the settings when automatic configuration is used: + `VSpacing( 1 ), + `Left + ( `CheckBox + ( `id("cups_autoconfig_configure_new_attachend"), + // CheckBox to enable that a print queue is automatically created + // when a USB printer is connected for the first time to the USB: + _("Enable &Automatic Configuration of New Attachend USB Printers") + ) + ), + `Left + ( `CheckBox + ( `id("cups_autoconfig_disable_on_removal"), + // CheckBox to disable the print queue + // when a USB printer is disconnected from the USB: + _("&Disable Printout when Disconnecting an USB Printer") + ) + ), + `Left + ( `ComboBox + ( `id("cups_autoconfig_operation_policy"), + // Header for a ComboBox to specify the CUPS operation policy + // for print queues which are automatically created + // when a USB printer is connected for the first time to the USB: + _("Operation &Policy for Automatically Configured USB Printers"), + [""] + ) + ) ) ) ); void initAutoconfig( string key ) { y2milestone( "entering initAutoconfig with key '%1'", key ); - // The whole Autoconfig Settings dialog is useless without having cups-autoconfig installed: + // The whole Autoconfig Settings dialog is useless without having cups-autoconfig installed. + // Therefore check if cups-autoconfig is installed and if not try to install it. + // It is perfectly o.k. when the user rejects cups-autoconfig to be installed + // (perhaps he selected it to be removed before in this dialog + // and re-launched this dialog by accident or to check the current setting). + // Therefore there is no additional message shown here when the dialog is useless + // because there was a Popup request that cups-autoconfig must be installed. boolean autoconfig_settings_dialog_is_useless = false; - if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "install" ) ) - { autoconfig_settings_dialog_is_useless = true; - Popup::Error( // Popup::Error message - // Do not change or translate "cups-autoconfig", it is a RPM package name. - _("This dialog is useless without having the package cups-autoconfig installed") - ); + if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) ) + { if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "install" ) ) + { autoconfig_settings_dialog_is_useless = true; + } } + UI::ChangeWidget( `id("cups_autoconfig_remove"), `Value, autoconfig_settings_dialog_is_useless ); // Read cups-autoconfig settings. - // Ignore errors when the bash commands fail because the default values are used as fallback values. + // Ignore errors when the bash commands fail because the default values are used as + // fallback values in particular when the cups-autoconfig RPM is not installed. // By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": initial_cups_autoconfig_ConfigureNewPrinters = true; Printerlib::ExecuteBashCommand( "grep -i '^ConfigureNewPrinters' /etc/cups-autoconfig.conf | cut -s -d '=' -f2 | tr -d -c '[:alnum:]'" ); @@ -148,7 +179,8 @@ { UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Value, "not set" ); } if( autoconfig_settings_dialog_is_useless ) - { UI::ChangeWidget( `id("cups_autoconfig_label"), `Enabled, false ); + { UI::ChangeWidget( `id("cups_autoconfig_remove"), `Enabled, false ); + UI::ChangeWidget( `id("cups_autoconfig_label"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_configure_new_attachend"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Enabled, false ); @@ -159,6 +191,25 @@ void storeAutoconfig( string key, map event ) { y2milestone( "entering storeAutoconfig with key '%1'\nand event '%2'", key, event ); + // If the cups-autoconfig RPM should be removed and when it is currently installed, + // try to remove it and return because nothing else matters in this case. + // Return even when the user decided to reject the removal because + // it would lead to unexpected results when cups-autoconfig settings + // may change in the system when the user decided to remove cups-autoconfig + // but rejects the removal (i.e. some kind of "cancel/abort" by the user) + // but settings were changed in the system nevertheless. + // It is crucial to test whether cups-autoconfig is currently installed + // because it could have been not installed when the dialog was launched + // and the user may have rejected the installation in initAutoconfig + // so that the vaule of the "cups_autoconfig_remove" CheckBox would + // have been also set to 'true' in initAutoconfig. + if( (boolean)UI::QueryWidget( `id("cups_autoconfig_remove"), `Value ) ) + { if( Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) ) + { Printerlib::TestAndInstallPackage( "cups-autoconfig", "remove" ); + y2milestone( "leaving storeAutoconfig" ); + return nil; + } + } boolean applied_autoconfig_settings = true; // Get the actual settings and values from the dialog: boolean current_cups_autoconfig_ConfigureNewPrinters = (boolean)UI::QueryWidget( `id("cups_autoconfig_configure_new_attachend"), `Value ); -- 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] r52680 - /trunk/nfs-client/src/ui.ycp
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 16:05:10 2008 New Revision: 52680 URL: http://svn.opensuse.org/viewcvs/yast?rev=52680&view=rev Log: Correct enabling/disabling of edit and delete buttons depending on # of nfs shares (#438665) Modified: trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=52680&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Oct 29 16:05:10 2008 @@ -431,6 +431,12 @@ specific <b>NFSv4 Domain Name</b>, required for correct setting of file/directory access rights.</p>") + fw_cwm_widget["help"]:""; + void EnableDisableButtons() + { + UI::ChangeWidget(`id(`editbut), `Enabled, ( nfs_entries != [] ) ); + UI::ChangeWidget(`id(`delbut), `Enabled, ( nfs_entries != [] ) ); + } + term FstabTab() { term fstab_content = @@ -496,10 +502,7 @@ void InitFstabEntries( ) { UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); - - integer entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); - UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); - UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); + EnableDisableButtons(); // Kludge, because a `Table still does not have a shortcut. // Simple to solve here: there's only the table and buttons, @@ -545,11 +548,13 @@ map<string,any> entry = GetFstabEntry (nil, (list<map>) union (Nfs::non_nfs_entries, nfs_entries)); if (entry != nil) - { + { nfs_entries = add (nfs_entries, entry); modify_line = entry; + EnableDisableButtons(); + Nfs::SetModified(); - } + } UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); } @@ -581,7 +586,9 @@ modify_line = share; nfs_entries = remove (nfs_entries, entryno); UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); - Nfs::SetModified(); + EnableDisableButtons(); + + Nfs::SetModified(); } } else if (widget == `enable_nfs4) -- 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] r52679 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 15:49:51 2008 New Revision: 52679 URL: http://svn.opensuse.org/viewcvs/yast?rev=52679&view=rev Log: - more checks for crypt files Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 29 15:49:51 2008 @@ -199,6 +199,7 @@ } break; } + case `crypt_fs: MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); break; @@ -265,6 +266,14 @@ if (data["type"]:`unknown == `loop) { + if (!crypt_fs) + { + // error popup + Popup::Error(_("Crypt files must be encrypted.")); + widget = `again; + continue; + } + if (data["create_file"]:false && !do_format) { // error popup -- 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] r52678 - /tags/stable-2_17_36/packager/
by lslezak＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: lslezak Date: Wed Oct 29 15:35:00 2008 New Revision: 52678 URL: http://svn.opensuse.org/viewcvs/yast?rev=52678&view=rev Log: Created tag stable-2_17_36 for packager Added: tags/stable-2_17_36/packager/ - copied from r52677, 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

[yast-commit] r52677 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: lslezak Date: Wed Oct 29 15:34:55 2008 New Revision: 52677 URL: http://svn.opensuse.org/viewcvs/yast?rev=52677&view=rev Log: - copy slideshow to the correct place (bnc#439799) - 2.17.36 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=52677&r1=52… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Oct 29 15:34:55 2008 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 29 15:34:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 15:33:45 CET 2008 - lslezak(a)suse.cz + +- copy slideshow to the correct place (bnc#439799) +- 2.17.36 + +------------------------------------------------------------------- Mon Oct 27 14:04:11 CET 2008 - locilka(a)suse.cz - Reporting an error if software proposal cache is invalid Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Oct 29 15:34:55 2008 @@ -1096,8 +1096,12 @@ WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (loc_slidedir))); // copy all files to our own cache - y2milestone ("Copying %1/* to %2", providedir, String::Quote (loc_slidedir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", providedir, String::Quote (loc_slidedir))); + string copy_command = sformat("cp -r '%1/%2/txt/%3'/* '%4'", + String::Quote(providedir), String::Quote(search_for_dir), + String::Quote(used_loc_dir), String::Quote(loc_slidedir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); // where images are stored string imagesdir = sformat ("%1/pic", search_for_dir); @@ -1109,8 +1113,11 @@ string our_imagesdir = sformat ("%1/pic/", our_slidedir); WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (our_imagesdir))); - y2milestone ("Copying %1/* to '%2'", imagesdir, String::Quote (our_imagesdir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", imagesdir, String::Quote (our_imagesdir))); + copy_command = sformat("cp -r '%1/%2/pic'/* '%3'", + String::Quote(imagesdir), String::Quote(search_for_dir), String::Quote (our_imagesdir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); } else { y2error ("No such dir: %1", imagesdir); } -- 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] r52676 - in /trunk/registration: package/yast2-registration.changes src/config/automatic_online_update.rnc src/config/online_update_configuration.desktop src/config/online_update_configuration.rnc
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 15:32:04 2008 New Revision: 52676 URL: http://svn.opensuse.org/viewcvs/yast?rev=52676&view=rev Log: consistent naming in autoYaST profile Added: trunk/registration/src/config/online_update_configuration.rnc Removed: trunk/registration/src/config/automatic_online_update.rnc Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/config/online_update_configuration.desktop Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Oct 29 15:32:04 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 15:31:04 CET 2008 - jdsn(a)suse.de + +- consistent naming in autoYaST profile + +------------------------------------------------------------------- Fri Oct 24 23:06:02 CEST 2008 - jdsn(a)suse.de - checking if registration runs on xen (bnc#418287) Modified: trunk/registration/src/config/online_update_configuration.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/online_u… ============================================================================== --- trunk/registration/src/config/online_update_configuration.desktop (original) +++ trunk/registration/src/config/online_update_configuration.desktop Wed Oct 29 15:32:04 2008 @@ -8,7 +8,7 @@ X-SuSE-YaST-AutoInst=all X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan,proxy -X-SuSE-YaST-AutoInstSchema=automatic_online_update.rnc +X-SuSE-YaST-AutoInstSchema=online_update_configuration.rnc Icon=yast-online_update Exec=/sbin/yast2 online_update_configuration Added: trunk/registration/src/config/online_update_configuration.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/online_u… ============================================================================== --- trunk/registration/src/config/online_update_configuration.rnc (added) +++ trunk/registration/src/config/online_update_configuration.rnc Wed Oct 29 15:32:04 2008 @@ -0,0 +1,12 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +online_update_configuration = element online_update_configuration { enable_automatic_online_update? & skip_interactive_patches? & update_interval? } + + +enable_automatic_online_update = element enable_automatic_online_update { BOOLEAN } +skip_interactive_patches = element skip_interactive_patches { BOOLEAN } +update_interval = element update_interval { text } + + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0