December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59944 - in /trunk/vm: VERSION package/yast2-vm.changes src/VM_XEN.ycp yast2-vm.spec.in
by charlesa＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: charlesa Date: Thu Dec 3 19:03:25 2009 New Revision: 59944 URL: http://svn.opensuse.org/viewcvs/yast?rev=59944&view=rev Log: Add support for installing KVM. fate#306665 - KVM reaches supported status bnc#557233 - YaST needs to include kvm in virtualization support functionality Updated the version number. Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/VM_XEN.ycp trunk/vm/yast2-vm.spec.in Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=59944&r1=59943&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Thu Dec 3 19:03:25 2009 @@ -1 +1 @@ -2.16.10 +2.17.0 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Thu Dec 3 19:03:25 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Dec 2 16:23:55 MST 2009 - carnold(a)novell.com + +- Add support for installing KVM. + fate#306665 - KVM reaches supported status + bnc#557233 - YaST needs to include kvm in virtualization support + functionality + +------------------------------------------------------------------- Tue Jun 16 14:29:32 CEST 2009 - mvidner(a)suse.cz - Using autodocs-ycp.ami, which contains a fix for automake 1.11. Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=59944&r1=5… ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Thu Dec 3 19:03:25 2009 @@ -130,24 +130,6 @@ global boolean ConfigureDom0() { -/* if (Arch::is_xen() == false) { - // error - xen kernel must be running to start a new Xen domain, - // ask user to configure the first (management) Xen domain - if (Popup::YesNo(_("A Xen virtual machine can be started only -from the VM Server (domain 0), -which is not running now. - -Configure the VM Server now?"))) - { - y2milestone("Starting domain0 configuration..."); - } - else - { - y2milestone("Skipping domain0 configuration"); - return false; - } - } -*/ list <string> progress_stages = [ // progress stage 1/2 _("Verify Installed Packages"), @@ -158,6 +140,10 @@ list progress_descriptions = []; boolean bridge_exists = false; + boolean install_xen = false; + boolean install_kvm = false; + any widget_id = nil; + string bridge_path = ""; integer progress_length = size(progress_stages); @@ -177,6 +163,31 @@ // error popup string abortmsg = _("The installation will be aborted."); + // Generate a pop dialog to allow user selection of Xen or KVM + UI::OpenDialog( + `VBox( + `Label(_("Please select the virtualization platform to install")), + `Left(`CheckBox(`id(`xen), "Xen")), + `Left(`CheckBox(`id(`kvm), "KVM")), + `HBox( + `PushButton(`id(`accept), "&Accept" ), + `PushButton(`id(`cancel), "&Cancel" ) + ) + ) + ); + + widget_id = UI::UserInput(); + if ( widget_id == `accept ) { + install_xen = (boolean) UI::QueryWidget(`id(`xen), `Value); + install_kvm = (boolean) UI::QueryWidget(`id(`kvm), `Value); + } + if ( widget_id == `cancel || (install_xen == false && install_kvm == false) ) { + y2milestone("VM_XEN::ConfigureDom0 Cancel Selected or no platform selected."); + return false; + } + + UI::CloseDialog(); + Wizard::OpenNextBackDialog(); // enable progress @@ -188,10 +199,17 @@ // package stage Progress::NextStage(); - string kernel_pkg = "kernel-xen"; + // Common packages to both Xen and KVM (hard dependency in libvirt for xen-libs even if kvm only) + list<string> packages = ["libvirt", "libvirt-python", "xen-libs", "vm-install"]; - list<string> packages = ["xen", "xen-libs", "xen-tools", "vm-install"]; - packages = add(packages, kernel_pkg); + if ( install_xen ) { + packages = add(packages, "xen"); + packages = add(packages, "xen-tools"); + packages = add(packages, "kernel-xen"); + } + if ( install_kvm ) { + packages = add(packages, "kvm"); + } boolean inst_gui = true; @@ -243,10 +261,10 @@ // Popup yes/no dialog if ( bridge_exists == false ) { - if ( Popup::AnyQuestionRichText(_("Xen Network Bridge."), - _("For normal network configurations, xen needs a network bridge.Configure a default network bridge?"), + if ( Popup::AnyQuestionRichText(_("Network Bridge."), + _("For normal network configurations hosting virtual machines, a network bridge is recommended.Configure a default network bridge?"), 45, 5, Label::YesButton(), Label::NoButton(), `focus_yes) ) { - y2milestone("Configuring default bridge for Xen..."); + y2milestone("Configuring default bridge for Xen or KVM..."); WFM::call("lan_proposal", ["MakeProposal"]); UI::OpenDialog(`VBox()); WFM::call("lan_proposal", ["Write"]); @@ -267,19 +285,38 @@ Progress::Finish(); - if ( Arch::is_xen() == false ) { - // popup message - ask user to reboot the machine into Xen kernel - Popup::LongMessage(_("The machine is ready to start the VM Server. + string message_kvm = _("For installing KVM guests, reboot the machine to load the necessary drivers."); + string message_xen_reboot = _("For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu. +"); + string message_xen_ready = _("Hypervisor and tools are installed."); + string message = nil; -Reboot the machine and select the Xen section in the boot loader menu to start it. -")); + if ( install_xen == false ) { + Popup::LongMessage(message_kvm); } else { - // popup message - Notify user of successful completion (or already installed). - Popup::Message(_("Hypervisor and tools are installed.")); + if ( Arch::is_xen() == false ) { + if ( install_kvm == true ) { + message = sformat("%1\n\n%2", message_kvm, message_xen_reboot); + } + else { + message = message_xen_reboot; + } + // popup message - ask user to reboot the machine + Popup::LongMessage(message); + } + else { + // popup message - Notify user of successful completion (or already installed). + if ( install_kvm == true ) { + message = sformat("%1\n\n%2", message_kvm, message_xen_ready); + } + else { + message = message_xen_ready; + } + Popup::Message(message); + } } - Wizard::CloseDialog(); y2milestone("VM_XEN::ConfigureDom0 returned: %1", success); Modified: trunk/vm/yast2-vm.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/yast2-vm.spec.in?rev=59944&r1… ============================================================================== --- trunk/vm/yast2-vm.spec.in (original) +++ trunk/vm/yast2-vm.spec.in Thu Dec 3 19:03:25 2009 @@ -3,7 +3,6 @@ @HEADER@ Group: System/YaST -License: GPL v2 or later ExclusiveArch: %ix86 x86_64 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 -- 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] r59943 - in /trunk/qt-pkg: src/YQPackageSelector.cc src/YQPkgVersionsView.cc src/YQPkgVersionsView.h src/YQZypp.h yast2-qt-pkg.spec.in
by tgoettlicher＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: tgoettlicher Date: Thu Dec 3 17:17:19 2009 New Revision: 59943 URL: http://svn.opensuse.org/viewcvs/yast?rev=59943&view=rev Log: worked on multiversion installation Modified: trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgVersionsView.cc trunk/qt-pkg/src/YQPkgVersionsView.h trunk/qt-pkg/src/YQZypp.h trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Dec 3 17:17:19 2009 @@ -983,6 +983,9 @@ { connect( _pkgVersionsView, SIGNAL( candidateChanged( ZyppObj ) ), _pkgList, SLOT ( updateItemData() ) ); + + connect( _pkgVersionsView, SIGNAL( multiversionSelectionChanged( ) ), + _pkgList, SLOT ( updateItemData() ) ); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Thu Dec 3 17:17:19 2009 @@ -75,10 +75,8 @@ void YQPkgVersionsView::slotRefreshDetails( ) { - if ( !_selectable ) - return; - - showDetailsIfVisible ( _selectable ); + yuiMilestone() << "slotRefreshDetails" << endl; + emit multiversionSelectionChanged( ); } @@ -168,15 +166,18 @@ // Find installed and available objects ( for multiversion view ) // { - zypp::ui::Selectable::installed_iterator it = selectable->availableBegin(); + zypp::ui::Selectable::picklist_iterator it = selectable->picklistBegin(); - while ( it != selectable->availableEnd() ) + while ( it != selectable->picklistEnd() ) { YQPkgMultiVersion * version = new YQPkgMultiVersion( this, selectable, *it, _userCanSwitch ); _installed.push_back( version ); _layout->addWidget( version ); + + connect (version, SIGNAL(statusChanged()), this, SLOT(slotRefreshDetails())); + connect (this, SIGNAL(multiversionSelectionChanged()), version, SLOT(update())); ++it; } @@ -374,26 +375,24 @@ + YQPkgMultiVersion::YQPkgMultiVersion( QWidget * parent, ZyppSel selectable, - ZyppObj zyppObj, + ZyppPoolItem zyppPoolItem, bool enabled ) : QCheckBox( parent ) , _selectable( selectable ) - , _zyppObj( zyppObj ) + , _zyppPoolItem( zyppPoolItem ) { setText (_( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) - .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) - .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) - .arg( zyppObj->repository().info().priority() ) - .arg( fromUTF8( zyppObj->vendor().c_str() ) )); - - - connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); - + .arg( fromUTF8( zyppPoolItem->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppPoolItem->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppPoolItem->repository().info().name().c_str() ) ) + .arg( zyppPoolItem->repository().info().priority() ) + .arg( fromUTF8( zyppPoolItem->vendor().c_str() ) )); + connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); } @@ -402,19 +401,19 @@ // NOP } + void YQPkgMultiVersion::slotIconClicked() { // prevent checkmark, we draw the status icons ourselves setChecked( false ); - - cycleStatus(); } + void YQPkgMultiVersion::cycleStatus() { - ZyppStatus oldStatus = _selectable->status(); + ZyppStatus oldStatus = _selectable->pickStatus( _zyppPoolItem ); ZyppStatus newStatus = oldStatus; switch ( oldStatus ) @@ -470,37 +469,19 @@ break; } - yuiMilestone() << "new status: " << newStatus << endl; setStatus( newStatus ); -// _pkgObjList->sendStatusChanged(); - } + void YQPkgMultiVersion::setStatus( ZyppStatus newStatus ) { - ZyppStatus oldStatus = _selectable->status(); - _selectable->setStatus( newStatus ); - - if ( oldStatus != _selectable->status() ) - { -// applyChanges(); + _selectable->setPickStatus( _zyppPoolItem, newStatus ); -/* if ( sendSignals ) - { - _pkgObjList->updateItemStates(); - _pkgObjList->sendUpdatePackages(); - }*/ - } - - // setStatusIcon(); -// emit candidateChanged( ); + emit statusChanged(); } - - - void YQPkgMultiVersion::paintEvent(QPaintEvent *) { // draw the usual checkbox @@ -510,15 +491,14 @@ p.drawControl(QStyle::CE_CheckBox, opt); - // calculate position and draw the status icon QRect elementRect = style()->subElementRect ( QStyle::SE_CheckBoxIndicator, &opt); - QPixmap icon = statusIcon( _selectable->status() ); + QPixmap icon = statusIcon( _selectable->pickStatus(_zyppPoolItem) ); QPoint start = elementRect.center() - icon.rect().center(); QRect rect = QRect(start.x() - ICONOFFSET, start.y(), icon.width(), icon.height()); - p.drawItemPixmap(rect, 0, icon ); + p.drawItemPixmap( rect, 0, icon ); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.h (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.h Thu Dec 3 17:17:19 2009 @@ -90,6 +90,8 @@ * Emitted when the user changes the **/ void candidateChanged( ZyppObj newCandidate ); + void multiversionSelectionChanged( ); + protected slots: @@ -179,7 +181,7 @@ **/ YQPkgMultiVersion( QWidget * parent, ZyppSel selectable, - ZyppObj zyppObj, + ZyppPoolItem zyppPoolItem, bool enabled = true ); /** @@ -188,42 +190,33 @@ virtual ~YQPkgMultiVersion(); /** - * Returns the original ZYPP object - **/ - ZyppObj zyppObj() const { return _zyppObj; } - - /** * Returns the original ZYPP selectable **/ ZyppSel selectable() const { return _selectable; } - + /** + * Paints checkboxes with status icons instead of a checkmark + **/ void paintEvent(QPaintEvent *); - - protected: void cycleStatus(); void setStatus( ZyppStatus newStatus ); QPixmap statusIcon( ZyppStatus status ); - - - - // Data members ZyppSel _selectable; - ZyppObj _zyppObj; - + ZyppPoolItem _zyppPoolItem; - int _state; protected slots: void slotIconClicked(); +signals: + void statusChanged(); }; Modified: trunk/qt-pkg/src/YQZypp.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZypp.h?rev=59943&r1… ============================================================================== --- trunk/qt-pkg/src/YQZypp.h (original) +++ trunk/qt-pkg/src/YQZypp.h Thu Dec 3 17:17:19 2009 @@ -55,6 +55,7 @@ typedef zypp::Pattern::constPtr ZyppPattern; typedef zypp::Patch::constPtr ZyppPatch; typedef zypp::Product::constPtr ZyppProduct; +typedef zypp::PoolItem ZyppPoolItem; typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Thu Dec 3 17:17:19 2009 @@ -11,9 +11,9 @@ BuildRequires: yast2-devtools >= 2.16.3 Requires: yast2-qt >= 2.17.13 BuildRequires: yast2-qt-devel >= 2.17.13 -BuildRequires: libzypp-devel >= 6.19.3 +BuildRequires: libzypp-devel >= 6.26.0 BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: libzypp >= 6.19.0 +Requires: libzypp >= 6.26.0 Requires: yast2-libyui >= 2.17.14 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 -- 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] r59942 - in /trunk/printer/src: Printer.ycp basicadd.ycp basicmodify.ycp connectionwizard.ycp
by jsmeix＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: jsmeix Date: Thu Dec 3 17:09:38 2009 New Revision: 59942 URL: http://svn.opensuse.org/viewcvs/yast?rev=59942&view=rev Log: Replaced several duplicated code blocks in basicmodify.ycp basicadd.ycp connectionwizard.ycp by calling the new added DeriveModelName and DeriveDriverFilterString functions in Printer.ycp. Modified: trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/connectionwizard.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=5994… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Thu Dec 3 17:09:38 2009 @@ -759,6 +759,134 @@ } /** + * Derive a reasonable model info from an arbitrary description string. + * @param string from which a model is derived. + * @return string (possibly the empty string) + */ +global string DeriveModelName( string description ) +{ string model_info = ""; + list <string> description_words = splitstring( description, " " ); + // Remove empty words because a sequence of spaces results empty words in description_words + // for example "ACME Funprinter" (two spaces!) results ["ACME","","Funprinter"]. + // In Printer.ycp and basicmodify.ycp there are lines like + // description = model + " with driver " + description; + // new_description = model + " with driver " + new_description; + // Avoid having "with" and/or "driver" in the model_info. + description_words = filter( string word, + description_words, + { return( "" != word && "with" != word && "driver" != word ); + } + ); + // Use the description only if its first word is actually a known manufacturer: + boolean description_starts_with_known_manufacturer = false; + foreach( string known_manufacturer, + known_manufacturers, + { if( tolower( description_words[0]:"" ) == tolower( known_manufacturer ) ) + { description_starts_with_known_manufacturer = true; + break; + } + } + ); + if( description_starts_with_known_manufacturer ) + { // After the first word which contains the manufacturer name + // there are none or up to two words which contain only letters and hyphens (the model name) + // and then there is a word which contains at least one number (the model series). + // Therefore the manufacturer and model sub-string can be assumed to be: + // One word which contains the manufacturer name, + // followed by at most two words which contain only letters and perhaps hyphens + // finished by one word which may start with letters and hyphens + // but it must contain at least one number followed by whatever characters. + // It is crucial to take whatever (trailing) character in the model series into account + // to be on the safe side to distinguish different models + // (e.g. "HP LaserJet 4" versus "HP LaserJet 4/4M" or "Kyocera FS-1000" versus "Kyocera FS-1000+"). + // For example as egrep regular expression: + // lpinfo -m | cut -d' ' -f2- + // | egrep -o '^[[:alpha:]]+[[:space:]]+([[:alpha:]-]+[[:space:]]+){0,2}[[:alpha:]-]*[[:digit:]][^[:space:]]*' + // Of course this best-guess is not 100% correct because it would result for example + // that "ACME FunPrinter 1000" and "ACME FunPrinter 1000 XL" + // are considered to be the same model "ACME FunPrinter 1000" + // but "ACME FunPrinter 1000XL" and "ACME FunPrinter 1000 XL" + // are considered to be different models "ACME FunPrinter 1000XL" and "ACME FunPrinter 1000": + boolean skip_the_rest = false; + integer index = -1; + description_words = maplist( string word, + description_words, + { if( ! skip_the_rest ) + { index = index + 1; + if( 0 == index ) + { // Return the manufacturer name: + return word; + } + if( 1 == index || 2 == index ) + { // Check for words which look like the model name: + if( "" == deletechars( word, letter_chars + "-" ) ) + { // Return a word of the model name: + return word; + } + } + if( 1 == index || 2 == index || 3 == index ) + { // Check for a word which looks like the model series: + if( "" != filterchars( word, number_chars ) ) + { // Skip the rest after the first model series word: + skip_the_rest = true; + // Return the model series: + return word; + } + } + } + } + ); + model_info = mergestring( description_words, " " ); + } + y2milestone("DeriveModelName: derived '%1' from '%2'", model_info, description ); + return model_info; +} + +/** + * Derive a reasonable model info from an arbitrary description string. + * @param string from which a model is derived. + * @return string (possibly the empty string) + */ +global string DeriveDriverFilterString( string driver_filter_input_text ) +{ string driver_filter_string = ""; + list <string> words = splitstring( driver_filter_input_text, " " ); + // Remove empty words because a sequence of spaces results empty words in words + // for example "ACME Funprinter" (two spaces!) results ["ACME","","Funprinter"]. + // Avoid having meaningless words like "series" or "Serie" + // and "Mita" (from "Kyocera Mita") in the driver_filter_string + // (the driver_filter_string "kyocera.*FS-1000" finds the "Kyocera Mita FS-1000+") + words = filter( string word, + words, + { return( "" != word + && ! issubstring( tolower( word ), "serie" ) + && "mita" != tolower( word ) + ); + } + ); + if( size( words ) > 0 ) + { // Replace each sequence of spaces in driver_filter_input_text + // by the regular expression '.*' so that the search result + // hopefully fits better to what the user expects to get, + // for example searching with "ACME 1000" should work to also + // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" + // Besides the regular expression characters '.*' + // only the special character '+' is also taken into account + // because this is also a meaningful character in model names + // for example the '+' at the end of a Kyocera model name + // indicates that this model has a built-in PostScript interpreter + // while the model without the '+' understands only PCL. + driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), lower_alnum_chars + ".*+" ); + // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') + // to get a '+' character in a word quoted as '\+' because otherwise + // a '+' character would be interpreded as a special regular expression character + // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). + driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + } + y2milestone("DeriveDriverFilterString: derived '%1' from '%2'", driver_filter_string, driver_filter_input_text ); + return driver_filter_string; +} + +/** * Create a valid new queue name. * @param proposal string from which a valid new queue name is derived. * @return string Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=599… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Thu Dec 3 17:09:38 2009 @@ -408,33 +408,10 @@ ) { queue_name_proposal = Printer::NewQueueName( tolower( model ) ); driver_filter_input_text = model; - // Replace each sequence of spaces in driver_filter_input_text - // by the regular expression '.*' so that the search result - // hopefully fits better to what the user expects to get, - // for example searching with "ACME 1000" should work to also - // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" - list <string> words = splitstring( driver_filter_input_text, " " ); - // A sequence of spaces results empty strings in words which are removed here: - words = filter( string word, - words, - { return( "" != word ); - } - ); - // Besides the regular expression characters '.*' - // only the special character '+' is also taken into account - // because this is also a meaningful character in model names - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), Printer::lower_alnum_chars + ".*+" ); - // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') - // to get a '+' character in a word quoted as '\+' because otherwise - // a '+' character would be interpreded as a special regular expression character - // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). - driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); // The first word in the driver_filter_string is usually the first word of the manufacturer name. // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" result the same. - // Note that because of the above the words in driver_filter_string are joined with '.*' + // Note that DeriveDriverFilterString joined the words in driver_filter_string with '.*' // so that the first word in driver_filter_string must be split from the rest at '.': string manufacturer = splitstring( driver_filter_string, "." )[0]:""; // Even more fuzziness for very ambiguous manufacturer names: @@ -515,30 +492,7 @@ driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "Drivers for '%1'", driver_filter_input_text ); // Match anywhere in the NickName entry in the PPD (i.e. without leading '^'). - // Replace each sequence of spaces in driver_filter_input_text - // by the regular expression '.*' so that the search result - // hopefully fits better to what the user expects to get, - // for example searching with "ACME 1000" should work to also - // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" - list <string> words = splitstring( driver_filter_input_text, " " ); - // A sequence of spaces results empty strings in words which are removed here: - words = filter( string word, - words, - { return( "" != word ); - } - ); - // Besides the regular expression characters '.*' - // only the special character '+' is also taken into account - // because this is also a meaningful character in model names - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), Printer::lower_alnum_chars + ".*+" ); - // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') - // to get a '+' character in a word quoted as '\+' because otherwise - // a '+' character would be interpreded as a special regular expression character - // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). - driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); if( "" == driver_filter_string ) { driver_filter_input_text = _("any model"); } Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Thu Dec 3 17:09:38 2009 @@ -76,41 +76,7 @@ false ); Wizard::HideAbortButton(); - string model = ""; - list <string> description_words = splitstring( description, " " ); - // In Printer.ycp and basicmodify.ycp there are lines like - // description = model + " with driver " + description; - // new_description = model + " with driver " + new_description; - // Avoid having "with" and/or "driver" in the model string: - description_words = filter( string word, - description_words, - { return( "with" != word && "driver" != word ); - } - ); - // Use the queue description only if its first word is actually a known manufacturer: - boolean description_starts_with_known_manufacturer = false; - foreach( string known_manufacturer, - Printer::known_manufacturers, - { if( tolower( description_words[0]:"" ) == tolower( known_manufacturer ) ) - { description_starts_with_known_manufacturer = true; - break; - } - } - ); - if( description_starts_with_known_manufacturer ) - { if( size( description_words ) > 2 ) - { model = description_words[0]:"" + " " - + description_words[1]:"" + " " - + description_words[2]:""; - } - if( size( description_words ) == 2 ) - { model = description_words[0]:"" + " " - + description_words[1]:""; - } - if( size( description_words ) == 1 ) - { model = description_words[0]:""; - } - } + string model = Printer::DeriveModelName( description ); string driver_filter_input_text = model; // Match anywhere in the NickName entry in the PPD: string driver_filter_string = filterchars( tolower( driver_filter_input_text ), Printer::lower_alnum_chars ); @@ -298,6 +264,13 @@ true ); } + if( "" == driver_filter_string ) + { // Set a fallback driver_filter_string which does not match to anything + // to avoid that the full list of thousands of PPDs is shown automatically + // because it can take a very long time until the user can proceed: + driver_filter_input_text = _("Enter your printer model here."); + driver_filter_string = "qqqqqqqqqq"; + } term contents = `VBox ( `VBox ( `HBox @@ -540,6 +513,13 @@ string description_input = (string)UI::QueryWidget( `id(`description_input), `Value ); // Delete ' characters because they are used for quoting in the bash commandline: description_input = deletechars( description_input, "'" ); + // Leading and/or trailing and/or sequences of spaces look ugly and are condensed here: + description_input = mergestring( filter( string word, + splitstring( description_input, " " ), + { return( "" != word ); } + ), + " " + ); if( description_input != description ) { commandline = commandline + " -D '" + description_input + "'"; something_has_changed = true; @@ -547,6 +527,13 @@ string location_input = (string)UI::QueryWidget( `id(`location_input), `Value ); // Delete ' characters because they are used for quoting in the bash commandline: location_input = deletechars( location_input, "'" ); + // Leading and/or trailing and/or sequences of spaces look ugly and are condensed here: + location_input = mergestring( filter( string word, + splitstring( location_input, " " ), + { return( "" != word ); } + ), + " " + ); if( location_input != location ) { commandline = commandline + " -L '" + location_input + "'"; something_has_changed = true; @@ -773,33 +760,10 @@ && "unknown" != tolower( model ) ) { driver_filter_input_text = model; - // Replace each sequence of spaces in driver_filter_input_text - // by the regular expression '.*' so that the search result - // hopefully fits better to what the user expects to get, - // for example searching with "ACME 1000" should work to also - // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" - list <string> words = splitstring( driver_filter_input_text, " " ); - // A sequence of spaces results empty strings in words which are removed here: - words = filter( string word, - words, - { return( "" != word ); - } - ); - // Besides the regular expression characters '.*' - // only the special character '+' is also taken into account - // because this is also a meaningful character in model names - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), Printer::lower_alnum_chars + ".*+" ); - // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') - // to get a '+' character in a word quoted as '\+' because otherwise - // a '+' character would be interpreded as a special regular expression character - // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). - driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); // The first word in the driver_filter_string is usually the first word of the manufacturer name. // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" result the same. - // Note that because of the above the words in driver_filter_string are joined with '.*' + // Note that DeriveDriverFilterString joined the words in driver_filter_string with '.*' // so that the first word in driver_filter_string must be split from the rest at '.': string manufacturer = splitstring( driver_filter_string, "." )[0]:""; // Even more fuzziness for very ambiguous manufacturer names: @@ -834,72 +798,12 @@ driver_filter_string = "^" + filterchars( tolower( nick_name ), Printer::lower_alnum_chars ); } else - { description_words = splitstring( description, " " ); - // In Printer.ycp and basicmodify.ycp there are lines like - // description = model + " with driver " + description; - // new_description = model + " with driver " + new_description; - // Avoid having "with" and/or "driver" in the model string: - description_words = filter( string word, - description_words, - { return( "with" != word && "driver" != word ); - } - ); - // Use the queue description only if its first word is actually a known manufacturer: - boolean description_starts_with_known_manufacturer = false; - foreach( string known_manufacturer, - Printer::known_manufacturers, - { if( tolower( description_words[0]:"" ) == tolower( known_manufacturer ) ) - { description_starts_with_known_manufacturer = true; - break; - } - } - ); - if( description_starts_with_known_manufacturer ) - { if( size( description_words ) > 2 ) - if( size( description_words ) > 2 ) - { model = description_words[0]:"" + " " - + description_words[1]:"" + " " - + description_words[2]:""; - } - if( size( description_words ) == 2 ) - { model = description_words[0]:"" + " " - + description_words[1]:""; - } - if( size( description_words ) == 1 ) - { model = description_words[0]:""; - } - } - else - { model = ""; - } + { model = Printer::DeriveModelName( description ); driver_filter_input_text = model; - // Replace each sequence of spaces in driver_filter_input_text - // by the regular expression '.*' so that the search result - // hopefully fits better to what the user expects to get, - // for example searching with "ACME 1000" should work to also - // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" - list <string> words = splitstring( driver_filter_input_text, " " ); - // A sequence of spaces results empty strings in words which are removed here: - words = filter( string word, - words, - { return( "" != word ); - } - ); - // Besides the regular expression characters '.*' - // only the special character '+' is also taken into account - // because this is also a meaningful character in model names - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), Printer::lower_alnum_chars + ".*+" ); - // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') - // to get a '+' character in a word quoted as '\+' because otherwise - // a '+' character would be interpreded as a special regular expression character - // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). - driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); // The first word in the driver_filter_string is usually the first word of the manufacturer name. // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" result the same. - // Note that because of the above the words in driver_filter_string are joined with '.*' + // Note that DeriveDriverFilterString joined the words in driver_filter_string with '.*' // so that the first word in driver_filter_string must be split from the rest at '.': string manufacturer = splitstring( driver_filter_string, "." )[0]:""; // Even more fuzziness for very ambiguous manufacturer names: @@ -1063,30 +967,7 @@ driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "Drivers for '%1'", driver_filter_input_text ); // Match anywhere in the NickName entry in the PPD (i.e. without leading '^'). - // Replace each sequence of spaces in driver_filter_input_text - // by the regular expression '.*' so that the search result - // hopefully fits better to what the user expects to get, - // for example searching with "ACME 1000" should work to also - // find "ACME FunPrinter 1000" and "ACME Fancy Printer 1000 XL" - list <string> words = splitstring( driver_filter_input_text, " " ); - // A sequence of spaces results empty strings in words which are removed here: - words = filter( string word, - words, - { return( "" != word ); - } - ); - // Besides the regular expression characters '.*' - // only the special character '+' is also taken into account - // because this is also a meaningful character in model names - // for example the '+' at the end of a Kyocera model name - // indicates that this model has a built-in PostScript interpreter - // while the model without the '+' understands only PCL. - driver_filter_string = filterchars( tolower( mergestring( words, ".*" ) ), Printer::lower_alnum_chars + ".*+" ); - // Replace '+' by '\\+' which evaluates to '\+' (because of YCP quoting with '\\') - // to get a '+' character in a word quoted as '\+' because otherwise - // a '+' character would be interpreded as a special regular expression character - // when the driver_filter_string is used as pattern for regexpmatch in DriverItems(). - driver_filter_string = mergestring( splitstring( driver_filter_string, "+" ), "\\+" ); + driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); if( "" == driver_filter_string ) { driver_filter_input_text = _("any model"); } Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Thu Dec 3 17:09:38 2009 @@ -158,49 +158,7 @@ if( "" != current_model_info && "unknown" != tolower( current_model_info ) ) - { list <string> description_words = splitstring( current_model_info, " " ); - // In Printer.ycp and basicmodify.ycp there are lines like - // description = model + " with driver " + description; - // new_description = model + " with driver " + new_description; - // Avoid having "with" and/or "driver" in the current_model_info: - description_words = filter( string word, - description_words, - { return( "with" != word && "driver" != word ); - } - ); - // Use the queue description only if its first word is actually a known manufacturer: - boolean description_starts_with_known_manufacturer = false; - foreach( string known_manufacturer, - Printer::known_manufacturers, - { if( tolower( description_words[0]:"" ) == tolower( known_manufacturer ) ) - { description_starts_with_known_manufacturer = true; - break; - } - } - ); - if( description_starts_with_known_manufacturer ) - { if( size( description_words ) > 2 - && "with" != description_words[1]:"" - && "with" != description_words[2]:"" - && "driver" != description_words[2]:"" - ) - { current_model_info = description_words[0]:"" + " " - + description_words[1]:"" + " " - + description_words[2]:""; - } - if( size( description_words ) == 2 - && "with" != description_words[1]:"" - ) - { current_model_info = description_words[0]:"" + " " - + description_words[1]:""; - } - if( size( description_words ) == 1 ) - { current_model_info = description_words[0]:""; - } - } - else - { current_model_info = ""; - } + { current_model_info = Printer::DeriveModelName( current_model_info ); } } if( "" != current_model_info -- 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] r59941 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: rhafer Date: Thu Dec 3 16:53:08 2009 New Revision: 59941 URL: http://svn.opensuse.org/viewcvs/yast?rev=59941&view=rev Log: updated changelog Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Thu Dec 3 16:53:08 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 3 15:50:15 UTC 2009 - rhafer(a)novell.com + +- increase the sizelimit for the syncrepl user to unlimtied When + setting up a master or preparing a remote master (bnc#557966) + +------------------------------------------------------------------- Thu Dec 3 08:50:27 UTC 2009 - rhafer(a)novell.com - Always check server certficates of the master on syncrepl clients -- 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] r59940 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapServer.pm lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: rhafer Date: Thu Dec 3 16:53:05 2009 New Revision: 59940 URL: http://svn.opensuse.org/viewcvs/yast?rev=59940&view=rev Log: silenced default logging a bit Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Thu Dec 3 16:53:05 2009 @@ -2882,7 +2882,7 @@ else { my $limits = SCR->Read(".ldapserver.database.{".$i."}.limits" ); - y2debug("Database $i limits:". Data::Dumper->Dump([ $limits ]) ); + y2milestone("Database $i limits:". Data::Dumper->Dump([ $limits ]) ); foreach my $limit (@$limits) { if ( $limit->{'selector'} eq "dn.exact=\"".$syncreplbaseconfig->{'binddn'}."\"" ) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Thu Dec 3 16:53:05 2009 @@ -191,7 +191,7 @@ void OlcConfigEntry::setStringValue(const std::string &type, const std::string &value) { - log_it(SLAPD_LOG_INFO,"setStringValue() " + type + " " + value); + log_it(SLAPD_LOG_DEBUG,"setStringValue() " + type + " " + value); if ( value.empty() ) { m_dbEntryChanged.delAttribute(type); @@ -290,7 +290,7 @@ if ( deleted ) { delValues.add(*j); - log_it(SLAPD_LOG_INFO,"Value deleted: " + *j ); + log_it(SLAPD_LOG_DEBUG,"Value deleted: " + *j ); } } j = changedAttr->getValues().begin(); @@ -308,7 +308,7 @@ if ( added ) { addValues.add(*j); - log_it(SLAPD_LOG_INFO,"Value added: " + *j); + log_it(SLAPD_LOG_DEBUG,"Value added: " + *j); } } bool replace = false; @@ -1206,11 +1206,11 @@ spos1 = spos2; spos2 = securityVal.find_first_of("=", spos1 ); std::string key = securityVal.substr(spos1, spos2-spos1); - log_it(SLAPD_LOG_INFO, "Key: <" + key + ">"); + log_it(SLAPD_LOG_DEBUG, "Key: <" + key + ">"); spos1 = spos2 + 1; spos2 = extractAlcToken(securityVal, spos1, false ); std::string value = securityVal.substr(spos1, spos2-spos1); - log_it(SLAPD_LOG_INFO, "Value: <" + value + ">"); + log_it(SLAPD_LOG_DEBUG, "Value: <" + value + ">"); if ( spos2 != std::string::npos ) { spos1 = spos2 + 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] r59939 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: rhafer Date: Thu Dec 3 16:53:02 2009 New Revision: 59939 URL: http://svn.opensuse.org/viewcvs/yast?rev=59939&view=rev Log: Set unlimited size limit for syncrepl user (bnc#557966) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Thu Dec 3 16:53:02 2009 @@ -1815,6 +1815,12 @@ $rc = SCR->Write(".ldapserver.database.{0}.acl", \@syncacl ); push @syncacl, @$defaultDbAcls; $defaultDbAcls = \@syncacl; + + my @newlimits = ( { 'selector' => "dn.exact=\"$syncdn\"", + 'limits' => [ { 'type' => "size.soft", + 'value' => "unlimited" } ] } ); + SCR->Write(".ldapserver.database.{0}.limits", \@newlimits ); + SCR->Write(".ldapserver.database.{1}.limits", \@newlimits ); } } @@ -2861,6 +2867,54 @@ } } } + for ( my $i=0; $i < scalar(@{$dbs})-1; $i++) + { + my $type = $dbs->[$i+1]->{'type'}; + my $suffix = $dbs->[$i+1]->{'suffix'}; + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + { + my $db = SCR->Read(".ldapserver.database.{".$i."}" ); + my $needslimit = 1; + if ( lc($db->{'rootdn'}) eq lc($syncreplbaseconfig->{'binddn'}) ) + { + y2milestone("Repl DN \"".$syncreplbaseconfig->{'binddn'}. "\" is rootdn of database $i. No limit needed"); + } + else + { + my $limits = SCR->Read(".ldapserver.database.{".$i."}.limits" ); + y2debug("Database $i limits:". Data::Dumper->Dump([ $limits ]) ); + foreach my $limit (@$limits) + { + if ( $limit->{'selector'} eq "dn.exact=\"".$syncreplbaseconfig->{'binddn'}."\"" ) + { + my $limitvals = $limit->{'limits'}; + foreach my $val (@$limitvals ) + { + if ( $val->{'type'} eq "size.soft" && $val->{'value'} eq "unlimited" ) + { + y2milestone("limit already present, no need to add"); + $needslimit = 0; + last; + } + } + if (! $needslimit ) + { + last; + } + } + } + if ($needslimit) + { + y2milestone("Setting sizelimit for syncrepuser to unlimited."); + my @newlimits = ( { 'selector' => "dn.exact=\"".$syncreplbaseconfig->{'binddn'}."\"", + 'limits' => [ { 'type' => "size.soft", + 'value' => "unlimited" } ] } ); + push @newlimits, @$limits; + SCR->Write(".ldapserver.database.{".$i."}.limits", \@newlimits ); + } + } + } + } SCR->Execute(".ldapserver.commitChanges" ); SCR->Execute(".ldapserver.reset" ); Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Thu Dec 3 16:53:02 2009 @@ -851,6 +851,37 @@ return YCPNull(); } } + else if ( dbComponent == "limits" ) + { + YCPList resList; + OlcLimitList limitList; + if ( (*i)->getLimits(limitList) ) + { + OlcLimitList::const_iterator j; + for ( j = limitList.begin(); j != limitList.end(); j++ ) + { + YCPMap limitMap; + YCPList limitVals; + pairlist limits = (*j)->getLimits(); + pairlist::const_iterator k ; + for ( k = limits.begin(); k != limits.end(); k++ ) + { + YCPMap valMap; + valMap.add(YCPString("type"), YCPString(k->first) ); + valMap.add(YCPString("value"), YCPString(k->second) ); + limitVals.add(valMap); + } + limitMap.add( YCPString("selector"), YCPString( (*j)->getSelector().c_str() ) ); + limitMap.add( YCPString("limits"), limitVals); + resList.add(limitMap); + } + return resList; + } + else + { + return YCPNull(); + } + } else if ( dbComponent == "syncrepl" ) { YCPMap resMap; @@ -1667,6 +1698,30 @@ (*i)->replaceAccessControl(aclList); ret = true; } + else if ( dbComponent == "limits" ) + { + YCPList argList = arg->asList(); + OlcLimitList limitList; + for ( int j = 0; j < argList->size(); j++ ) + { + boost::shared_ptr<OlcLimits> limit( new OlcLimits() ); + YCPMap limitMap = argList->value(j)->asMap(); + limit->setSelector(limitMap->value(YCPString("selector"))->asString()->value_cstr() ); + + YCPList ycpLimitValues = limitMap->value(YCPString("limits"))->asList(); + pairlist limitVals; + for ( int k=0; k < ycpLimitValues->size(); k++ ) + { + YCPMap valMap = ycpLimitValues->value(k)->asMap(); + limitVals.push_back( make_pair(valMap->value(YCPString("type"))->asString()->value_cstr(), + valMap->value(YCPString("value"))->asString()->value_cstr() ) ); + } + limit->setLimits(limitVals); + limitList.push_back(limit); + } + (*i)->replaceLimits(limitList); + ret = true; + } else if ( dbComponent == "syncrepl" ) { YCPMap argMap = arg->asMap(); Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.cpp Thu Dec 3 16:53:02 2009 @@ -836,6 +836,86 @@ return aclString.str(); } +OlcLimits::OlcLimits( const std::string& limitString ) +{ + std::string::size_type spos = 0; + std::string::size_type tmppos = 0; + // limits look like this: <selector> <limit> [<limit> [...]] + + // split of the selector pattern + tmppos = limitString.find_first_not_of("\t ", spos ); + spos = tmppos; + tmppos = limitString.find_first_of("\t\" ", spos ); + // skip quoted whitespaces + while ( limitString[tmppos] == '"' && limitString[tmppos-1] != '\\') + { + tmppos = extractAlcToken( limitString, tmppos, true ); + tmppos = limitString.find_first_of("\t\" ", tmppos+1 ); + } + m_selector = limitString.substr(spos, tmppos-spos ); + log_it(SLAPD_LOG_DEBUG, "selector: <"+m_selector+">" ); + + // now the list of <limits> follows + spos = tmppos; + if ( spos != std::string::npos ) + { + spos = limitString.find_first_not_of("\t ", spos ); + } + while ( spos != std::string::npos ) + { + tmppos = extractAlcToken( limitString, spos, false ); + std::string tmp = limitString.substr( spos, tmppos-spos ); + log_it(SLAPD_LOG_DEBUG, "limit: <"+tmp+">" ); + std::string::size_type delimpos = tmp.find( '=' ); + if ( delimpos == std::string::npos ) + { + throw std::runtime_error( "error while parsing limits statement" ); + } + m_limits.push_back( make_pair(tmp.substr(0, delimpos), tmp.substr( delimpos+1 ) )); + if ( tmppos != std::string::npos ) + { + spos = limitString.find_first_not_of("\t ", tmppos+1 ); + } + else + { + break; + } + } +} + +void OlcLimits::setSelector( const std::string &value ) +{ + m_selector = value; +} + +void OlcLimits::setLimits ( const pairlist &value ) +{ + m_limits = value; +} + +std::string OlcLimits::getSelector() const +{ + return m_selector; +} + +pairlist OlcLimits::getLimits() const +{ + return m_limits; +} + +std::string OlcLimits::toLimitsString() const +{ + std::ostringstream limitStr; + limitStr << m_selector; + + pairlist::const_iterator i; + for ( i=m_limits.begin(); i != m_limits.end(); i++ ) + { + limitStr << " " << i->first << "=" << i->second ; + } + return limitStr.str(); +} + const std::string OlcSyncRepl::RID="rid"; const std::string OlcSyncRepl::PROVIDER="provider"; const std::string OlcSyncRepl::BASE="searchbase"; @@ -1315,6 +1395,54 @@ } } +bool OlcDatabase::getLimits(OlcLimitList &limitList) const +{ + const LDAPAttribute* limitsAttr = m_dbEntryChanged.getAttributeByName("olcLimits"); + log_it(SLAPD_LOG_INFO, "OlcDatabase::getLimits()"); + limitList.clear(); + bool ret = true; + if ( limitsAttr ) + { + StringList values = limitsAttr->getValues(); + StringList::const_iterator i; + for ( i = values.begin(); i != values.end(); i++ ) + { + log_it(SLAPD_LOG_DEBUG, "limits VALUE: " + *i ); + std::string limitString; + splitIndexFromString( *i, limitString ); + try { + boost::shared_ptr<OlcLimits> limit( new OlcLimits(limitString) ); + limitList.push_back(limit); + } + catch ( std::runtime_error e ) + { + log_it(SLAPD_LOG_INFO, "Can't parse Limit"); + log_it(SLAPD_LOG_INFO, e.what() ); + limitList.clear(); + ret = false; + break; + } + } + } + else + { + log_it(SLAPD_LOG_INFO, "no limit set"); + } + return ret; +} + +void OlcDatabase::replaceLimits( const OlcLimitList& limits ) +{ + this->setStringValue( "olcLimits", "" ); + OlcLimitList::const_iterator i; + int j = 0; + + for ( i = limits.begin(); i != limits.end(); i++ ) + { + this->addIndexedStringValue( "olcLimits", (*i)->toLimitsString(), j ); + j++; + } +} OlcSyncReplList OlcDatabase::getSyncRepl() const { Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/lib/slapd-config.h Thu Dec 3 16:53:02 2009 @@ -232,6 +232,25 @@ OlcAclByList m_byList; }; +typedef std::list<std::pair<std::string,std::string> > pairlist; +class OlcLimits +{ + public: + inline OlcLimits() {} + + OlcLimits( const std::string &limitsString); + void setSelector( const std::string &value ); + void setLimits ( const pairlist&value ); + + std::string getSelector() const; + pairlist getLimits() const; + + std::string toLimitsString() const; + private: + std::string m_selector; + pairlist m_limits; +}; + class OlcSyncRepl { public: @@ -312,6 +331,7 @@ typedef std::list<boost::shared_ptr<OlcOverlay> > OlcOverlayList; typedef std::list<boost::shared_ptr<OlcAccess> > OlcAccessList; +typedef std::list<boost::shared_ptr<OlcLimits> > OlcLimitList; typedef std::list<boost::shared_ptr<OlcSyncRepl> > OlcSyncReplList; class OlcDatabase : public OlcConfigEntry @@ -334,6 +354,9 @@ bool getAcl( OlcAccessList& accessList ) const; virtual void addAccessControl( const std::string& acl, int index=-1 ); virtual void replaceAccessControl( const OlcAccessList& acllist ); + + bool getLimits( OlcLimitList& limitList ) const; + void replaceLimits( const OlcLimitList& limits ); OlcSyncReplList getSyncRepl() const; void setSyncRepl( const OlcSyncReplList& srl ); -- 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] r59938 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: aschnell Date: Thu Dec 3 15:57:54 2009 New Revision: 59938 URL: http://svn.opensuse.org/viewcvs/yast?rev=59938&view=rev Log: - log untranslated messages Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Dec 3 15:57:54 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 03 15:45:27 CET 2009 - aschnell(a)suse.de + +- log untranslated messages (requires libstorage 2.19.2) + +------------------------------------------------------------------- Wed Dec 02 15:22:20 CET 2009 - aschnell(a)suse.de - added extra warning for btrfs used as /boot or as / without Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Dec 3 15:57:54 2009 @@ -3715,6 +3715,7 @@ LibStorage::StorageInterface::getCommitInfos(sint, infos); list<map> ret = maplist(any info, infos, { return $[ `destructive : LibStorage::CommitInfo::swig_destructive_get(info), + `native : LibStorage::CommitInfo::swig_native_get(info), `text : LibStorage::CommitInfo::swig_text_get(info) ]; }); return ret; @@ -3725,19 +3726,28 @@ global string ChangeText() { - list<string> texts = maplist(map info, GetCommitInfos(), { + list<map> commit_infos = GetCommitInfos(); + + list<string> natives = maplist(map info, commit_infos, { + string native = String::EscapeTags(info[`native]:""); + if (info[`destructive]:false) + native = "" + native + ""; + return native; + }); + + list<string> texts = maplist(map info, commit_infos, { string text = String::EscapeTags(info[`text]:""); if (info[`destructive]:false) text = "" + text + ""; return text; }); - string ret = (size(texts) == 0) ? "" : HTML::List(texts); + string ret = isempty(texts) ? "" : HTML::List(texts); if (ret != save_chtxt) { - foreach(string text, texts, { - y2milestone("ChangeText %1", text); + foreach(string native, natives, { + y2milestone("ChangeText %1", native); }); save_chtxt = ret; } Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Thu Dec 3 15:57:54 2009 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.1 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.2 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7 -- 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] r59937 - /tags/branch-Code-11-SP1-2_17_7/backup/
by locilka＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: locilka Date: Thu Dec 3 15:51:19 2009 New Revision: 59937 URL: http://svn.opensuse.org/viewcvs/yast?rev=59937&view=rev Log: Created tag branch-Code-11-SP1-2_17_7 for backup Added: tags/branch-Code-11-SP1-2_17_7/backup/ (props changed) - copied from r59936, branches/SuSE-Code-11-SP1-Branch/backup/ -- 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] r59936 - /tags/stable-2_19_0/backup/
by locilka＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: locilka Date: Thu Dec 3 15:43:15 2009 New Revision: 59936 URL: http://svn.opensuse.org/viewcvs/yast?rev=59936&view=rev Log: Created tag stable-2_19_0 for backup Added: tags/stable-2_19_0/backup/ - copied from r59935, trunk/backup/ -- 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] r59935 - /tags/branch-Linux-11_2-2_18_5/backup/
by locilka＠svn.opensuse.org 03 Dec '09

03 Dec '09

Author: locilka Date: Thu Dec 3 15:40:19 2009 New Revision: 59935 URL: http://svn.opensuse.org/viewcvs/yast?rev=59935&view=rev Log: Created tag branch-Linux-11_2-2_18_5 for backup Added: tags/branch-Linux-11_2-2_18_5/backup/ - copied from r59934, branches/SuSE-Linux-11_2-Branch/backup/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0