October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52805 - in /trunk/installation: VERSION package/yast2-installation.changes src/include/inst_inc_first.ycp
by locilka＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: locilka Date: Fri Oct 31 16:33:57 2008 New Revision: 52805 URL: http://svn.opensuse.org/viewcvs/yast?rev=52805&view=rev Log: - Fixed checking whether running the second stage is required. - Added writing 'SecondStageRequired' 0/1 to /etc/install.inf (both bnc #439572) - 2.17.24 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52805&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Oct 31 16:33:57 2008 @@ -1 +1 @@ -2.17.23 +2.17.24 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Oct 31 16:33:57 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 31 16:28:23 CET 2008 - locilka(a)suse.cz + +- Fixed checking whether running the second stage is required. +- Added writing 'SecondStageRequired' 0/1 to /etc/install.inf + (both bnc #439572) +- 2.17.24 + +------------------------------------------------------------------- Thu Oct 30 14:42:15 CET 2008 - locilka(a)suse.cz - Saving sources at the end of inst_extrasources if some were Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Fri Oct 31 16:33:57 2008 @@ -147,21 +147,33 @@ } } + /** + * Writes to /etc/install.inf whether running the second stage is required + * This is written to inst-sys and not copied to the installed system + * (which is already umounted in that time). + * + * @see BNC #439572 + */ + void WriteSecondStageRequired (boolean scst_required) { + // writes 'SecondStageRequired' '1' or '0' + // if such tag exists, it is removed before + WFM::Execute (.local.bash, sformat ( + "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", + "SecondStageRequired", + (scst_required == false ? "0":"1"), + "/etc/install.inf" + )); + Linuxrc::ResetInstallInf(); + } + void HandleSecondStageRequired () { if (Stage::initial()) { // the current one is 'initial' + // after reboot/kexec it would be 'continue' string stage_to_check = "continue"; - // matching the control file - string mode_to_check = "unknown"; - - if (Mode::live_installation()) { - mode_to_check = "live_installation"; - } else if (Mode::installation()) { - mode_to_check = "installation"; - } else if (Mode::autoinst()) { - mode_to_check = "autoinstallation"; - } + // for matching the control file + string mode_to_check = Mode::mode(); // file name string run_yast_at_boot = sformat ("%1/%2", Installation::destdir, Installation::run_yast_at_boot); @@ -171,9 +183,11 @@ if (ProductControl::RunRequired (stage_to_check, mode_to_check)) { y2milestone ("Running the second stage is required"); WFM::Write (.local.string, run_yast_at_boot, ""); + WriteSecondStageRequired (true); } else { y2milestone ("It is not required to run the second stage"); WFM::Execute (.local.remove, run_yast_at_boot); + WriteSecondStageRequired (false); } } } -- 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] r52804 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: lslezak Date: Fri Oct 31 16:29:22 2008 New Revision: 52804 URL: http://svn.opensuse.org/viewcvs/yast?rev=52804&view=rev Log: - Pkg::ResolvableProperties() - return correct status for selected patterns (bnc#440611) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 31 16:29:22 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 31 16:29:10 CET 2008 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return correct status for selected + patterns (bnc#440611) + +------------------------------------------------------------------- Thu Oct 23 09:41:39 CEST 2008 - lslezak(a)suse.cz - added Pkg::SourceProvideSignedFile() function for downloading Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Fri Oct 31 16:29:22 2008 @@ -194,7 +194,12 @@ zypp::ResStatus status = item.status(); - if (status.isInstalled() || status.isSatisfied()) + if (status.isToBeInstalled()) + { + stat = "selected"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { @@ -206,11 +211,6 @@ stat = "installed"; } } - else if (status.isToBeInstalled()) - { - stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); - } else { stat = "available"; -- 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] r52803 - in /trunk/product-creator: package/yast2-product-creator.changes src/dialogs.ycp
by lslezak＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: lslezak Date: Fri Oct 31 16:22:26 2008 New Revision: 52803 URL: http://svn.opensuse.org/viewcvs/yast?rev=52803&view=rev Log: - read and set the product name (bnc#440609) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Oct 31 16:22:26 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 31 16:20:05 CET 2008 - lslezak(a)suse.cz + +- read and set the product name (bnc#440609) + +------------------------------------------------------------------- Fri Oct 24 13:12:05 CEST 2008 - lslezak(a)suse.cz - File "/PS3/otheros/otheros.bld" is optional when creating a PPC Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Fri Oct 31 16:22:26 2008 @@ -862,6 +862,24 @@ return (symbol)ret; } + string ProductFromRepo(integer repo_id) + { + map<string,string> read_content = ProductCreator::ReadContentFile(repo_id); + string prod_name = read_content["LABEL"]:""; + + y2milestone("Product name: %1", prod_name); + return prod_name; + } + + string ProductFromURL(string url) + { + integer src_id = ProductCreator::UrlToId([url])[0]:-1; + y2milestone("Reading product name from src %1", src_id); + string prod_name = ProductFromRepo(src_id); + + return prod_name; + } + define symbol baseProductSelectionDialog() { if (size(ProductCreator::Config["sources"]:[]) == 1) @@ -872,7 +890,14 @@ // remove the option if it exists if (haskey (ProductCreator::Config, "base_repo")) ProductCreator::Config = remove(ProductCreator::Config, "base_repo"); - return going_back ? `back : `next; + symbol ret = going_back ? `back : `next; + + if (ret == `next) + { + ProductCreator::Config["product"] = ProductFromURL((ProductCreator::Config["sources"]:[])[0]:""); + } + + return ret; } /* dialog caption */ @@ -944,6 +969,7 @@ if (ret == `next) { ProductCreator::Config["base_repo"] = base; + ProductCreator::Config["product"] = ProductFromURL(base); } return ret; @@ -1461,6 +1487,7 @@ // do not return patterns selected by dependencies foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""), { + y2debug("Processing pattern: %1", pat); if (pat["status"]:`none == `selected) { y2milestone ("pat %1 selected by %2" , pat["name"]:"", -- 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] r52802 - /tags/stable-2_17_21/users/
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 15:22:53 2008 New Revision: 52802 URL: http://svn.opensuse.org/viewcvs/yast?rev=52802&view=rev Log: Created tag stable-2_17_21 for users Added: tags/stable-2_17_21/users/ - copied from r52801, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52801 - in /trunk/users: VERSION configure.in.in package/yast2-users.changes src/Users.pm
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 15:22:48 2008 New Revision: 52801 URL: http://svn.opensuse.org/viewcvs/yast?rev=52801&view=rev Log: - delete crypted homes before writing /etc/passwd - check for cracklib-devel in configure - 2.17.21 Modified: trunk/users/VERSION trunk/users/configure.in.in trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=52801&r1=52800… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Oct 31 15:22:48 2008 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: trunk/users/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/configure.in.in?rev=52801&… ============================================================================== --- trunk/users/configure.in.in (original) +++ trunk/users/configure.in.in Fri Oct 31 15:22:48 2008 @@ -11,5 +11,13 @@ @YAST2-CHECKS-TESTSUITE@ @YAST2-CHECKS-PROGRAM@ +AC_LANG_PUSH(C++) +yast_found_cracklib=no +AC_CHECK_HEADER(crack.h,[yast_found_cracklib=yes]) +if [[ "$yast_found_cracklib" = "no" ]]; then + AC_MSG_ERROR(Headers for cracklib are missing. Install the package cracklib-devel.) +fi +AC_LANG_POP(C++) + ## and generate the output... @YAST2-OUTPUT@ Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Oct 31 15:22:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 15:09:40 CET 2008 - jsuchome(a)suse.cz + +- delete crypted homes before writing /etc/passwd +- check for cracklib-devel in configure +- 2.17.21 + +------------------------------------------------------------------- Wed Oct 29 09:08:54 CET 2008 - jsuchome(a)suse.cz - during live installation, available package is installed one Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=52801&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Oct 31 15:22:48 2008 @@ -4399,6 +4399,7 @@ # Write users if ($use_gui) { Progress->NextStage (); } + if ($users_modified) { if ($passwd_not_read) { # error popup (%s is a file name) @@ -4421,6 +4422,13 @@ $plugin_error = GetPluginError ($args, $result); } } + # remove the crypted directories now, so cryptconfig still knows them + if (!DeleteCryptedHomes ()) { + # error popup + $ret = __("An error occurred while removing users."); + Report->Error ($ret); + return $ret; + } # -------------------------------------- write /etc/passwd if ($plugin_error eq "" && !WritePasswd ()) { $ret = Message->ErrorWritingFile ("$base_directory/passwd"); @@ -4509,16 +4517,6 @@ Package->InstallAll (cryptconfig_packages ()); } - # remove the crypted directories now - if ($users_modified) { - if (!DeleteCryptedHomes ()) { - # error popup - $ret = __("An error occurred while removing users."); - Report->Error ($ret); - return $ret; - } - } - # Write passwords if ($use_gui) { Progress->NextStage (); } -- 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] r52800 - /tags/stable-2_17_30/printer/
by jsmeix＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsmeix Date: Fri Oct 31 14:58:33 2008 New Revision: 52800 URL: http://svn.opensuse.org/viewcvs/yast?rev=52800&view=rev Log: Created tag stable-2_17_30 for printer Added: tags/stable-2_17_30/printer/ - copied from r52799, 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] r52799 - in /trunk/printer: VERSION package/yast2-printer.changes src/overview.ycp
by jsmeix＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsmeix Date: Fri Oct 31 14:58:27 2008 New Revision: 52799 URL: http://svn.opensuse.org/viewcvs/yast?rev=52799&view=rev Log: - Added a test if a local cupsd does not listen on the official IPP port (631) to the Overview dialog. - 2.17.30 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/overview.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52799&r1=527… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Oct 31 14:58:27 2008 @@ -1 +1 @@ -2.17.29 +2.17.30 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 Fri Oct 31 14:58:27 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 14:51:29 CET 2008 - jsmeix(a)suse.de + +- Added a test if a local cupsd does not listen on the + official IPP port (631) to the Overview dialog. +- 2.17.30 + +------------------------------------------------------------------- Thu Oct 30 15:10:48 CET 2008 - jsmeix(a)suse.de - Added Firewall Settings to the Printing via Network dialog. Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=527… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Fri Oct 31 14:58:27 2008 @@ -125,7 +125,35 @@ ); void initOverview( string key ) -{ boolean local_content_selected = Printer::queue_filter_show_local; +{ // First of all the multi-line string because such strings cannot be indented: + string required_cupsd_not_accessible = + // Message of a Popup::ErrorDetails + // when a local cupsd is required but it is not accessible. + // YaST did already run 'lpstat -h localhost -r' + // to check whether or not a local cupsd is accessible. + // The command is shown here to the user (even if it is a bit technical) + // to have him informed what goes on here and what he can do on his own. +_("A local running CUPS daemon is required but it seems to be not accessible. +Check with 'lpstat -h localhost -r' whether a local cupsd is accessible. +A non-accessible cupsd leads to an endless sequence of further failures. +"); + string cupsd_not_on_official_port = + // Message of a Popup::ErrorDetails + // when the local cupsd does not use the official IPP port (631). + // A rather technical text because this does not happen on normal systems + // By default the cupsd uses the official IPP port (631). + // If not, the user must have intentionally and manually changed + // the port setting for the cupsd in /etc/cups/cupsd.conf +_("The CUPS daemon seems not to listen on the official IANA IPP port (631). +Check with 'netstat -nap | grep cupsd' where the cupsd actually listens. +This happens when there is a 'Listen ...:1234' or 'Port 1234' setting +in /etc/cups/cupsd.conf (check also if there is 'BrowsePort 1234'). +The YaST printer modue does not support a non-official port. +A non-official port leads to an endless sequence of further failures. +If you really must use a non-official port, you cannot use +the YaST printer modue to configure your printers. +"); + boolean local_content_selected = Printer::queue_filter_show_local; boolean remote_content_selected = Printer::queue_filter_show_remote; boolean local_cupsd_required = true; // Determine whether or not it is currently a real client-only config @@ -149,8 +177,46 @@ } // Determine whether or not a local cupsd is accessible: if( local_cupsd_required && ! Printerlib::GetAndSetCupsdStatus( "" ) ) - { // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: - Printerlib::GetAndSetCupsdStatus( "start" ); + { // Printerlib::GetAndSetCupsdStatus results also false when + // a local running cupsd does not listen on the official IPP port. + // Therefore, to be on the safe side, do a restart here. + // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: + Printerlib::GetAndSetCupsdStatus( "restart" ); + // Check again whether a required local cupsd is actually accessible + // because the user may have rejected to start it in the above call or + // the user may have aborted the Popup::TimedMessage from the above call + // which would wait until a started cupsd becomes actually accessible. + if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) + { Popup::ErrorDetails( required_cupsd_not_accessible, + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + // A special case is when the cupsd does not listen on the official IANA IPP port (631). + // Then "lpstat -h localhost -r" also fails ("-h localhost:port" would have to be used). + // When there is a process which runs the command "cupsd" + // check if something is accessible on port 631. + // Do this test only here (and not in Printerlib::GetAndSetCupsdStatus) + // because the Overview is the initial dialog which is shown to the user + // when the YaST printer module started and if the cupsd does not listen + // on the official IPP port, a single error popup when the Overview dialog + // is launched is sufficient. + // The YaST printer modue does not support when the cupsd listens + // on a non-official port e.g. via "Listen *:9999" and/or "Port 9999" + // and/or "BrowsePort 9999" settings in /etc/cups/cupsd.conf. + // Skip this test (and hope for the best) when netcat is not available + // because in yast2-printer.spec there can be only "Recommends: netcat" + // because there have been narrow-minded user complaints who insist + // not to have netcat installed because "netcat is a hacker intrusion tool" + // (explanations of the difference between netcat and e.g. nmap did not help). + if( Printerlib::ExecuteBashCommand( "ps -C cupsd" ) + && Printerlib::ExecuteBashCommand( "type -P netcat" ) + ) + { if( ! Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z localhost 631" ) ) + { Popup::ErrorDetails( cupsd_not_on_official_port, + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + } + } + } } UI::ChangeWidget( `local_content_checkbox, `Value, local_content_selected ); UI::ChangeWidget( `remote_content_checkbox, `Value, remote_content_selected ); -- 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] r52798 - in /trunk/storage: libstorage/bindings/ycp/LibStorage.i libstorage/src/Storage.cc libstorage/src/Storage.h libstorage/src/StorageInterface.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: aschnell Date: Fri Oct 31 14:43:19 2008 New Revision: 52798 URL: http://svn.opensuse.org/viewcvs/yast?rev=52798&view=rev Log: - added function getCommitInfo (for fate #302857) Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Fri Oct 31 14:43:19 2008 @@ -35,6 +35,7 @@ specialize_sequence(storage::DmraidInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::DmmultipathInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionSlotInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::CommitInfo, TO_PACK, FROM_PACK, CHECK) %include "../../src/StorageInterface.h" Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Oct 31 14:43:19 2008 @@ -3483,43 +3483,56 @@ } -deque<string> Storage::getCommitActions( bool mark_destructive ) const - { - deque<string> ret; +deque<string> +Storage::getCommitActions(bool mark_destructive) const +{ + CommitInfo info; + getCommitInfo(mark_destructive, info); + return info.actions; +} + + +void +Storage::getCommitInfo(bool mark_destructive, CommitInfo& info) const +{ + info.destructive = false; + info.actions.clear(); + ConstContPair p = contPair(); - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( !p.empty() ) - { + { list<commitAction*> ac; for( ConstContIterator i = p.begin(); i != p.end(); ++i ) - { + { list<commitAction*> l; i->getCommitActions( l ); ac.splice( ac.end(), l ); - } + } ac.sort( cont_less<commitAction>() ); string txt; for( list<commitAction*>::const_iterator i=ac.begin(); i!=ac.end(); ++i ) - { + { + if ((*i)->destructive) + info.destructive = true; txt.erase(); if( mark_destructive && (*i)->destructive ) txt += "<font color=red>"; txt += (*i)->descr; const Volume *v = (*i)->vol(); if( v && !v->getDescText().empty() ) - { + { txt += ". "; txt += v->getDescText(); - } + } if( mark_destructive && (*i)->destructive ) txt += "</font>"; - ret.push_back( txt ); + info.actions.push_back( txt ); delete *i; - } } - y2mil("ret.size():" << ret.size()); - return ret; } + y2mil("destructive:" << info.destructive << " actions.size():" << info.actions.size()); +} static bool sort_cont_up( const Container* rhs, const Container* lhs ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Fri Oct 31 14:43:19 2008 @@ -445,6 +445,7 @@ int removeDmraid( const string& name ); deque<string> getCommitActions( bool mark_destructive ) const; + void getCommitInfo(bool mark_destructive, CommitInfo& info) const; const string& getLastAction() const { return lastAction; } const string& getExtendedErrorMessage() const { return extendedError; } void eraseFreeInfo( const string& device ); Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Fri Oct 31 14:43:19 2008 @@ -452,6 +452,16 @@ }; /** + * Contains info about actions performed during commit(). + */ + struct CommitInfo + { + bool destructive; + deque<string> actions; + }; + + + /** * preliminary list of error codes, must have negative values */ enum ErrorCodes @@ -1302,7 +1312,8 @@ /** * Sets the value of description text. - * This text will be returned together with the text returned by getCommitActions + * This text will be returned together with the text returned by + * getCommitInfo(). * * @param device name of volume, e.g. /dev/hda1 * @param txt description text for this partition @@ -1814,13 +1825,24 @@ /** * Gets a list of string describing the actions to be executed - * after next call to commit() + * after next call to commit(). * + * Deprecated, use getCommitInfo(). + * * @param mark_destructive if true use <red> around </red> * destructive actions (like e.g. deletion, formatting, ...) * @return list of strings presentable to the user */ - virtual deque<string> getCommitActions( bool mark_destructive ) const = 0; + virtual deque<string> getCommitActions(bool mark_destructive) const = 0; + + /** + * Gets info about actions to be executed after next call to commit(). + * + * @param mark_destructive if true use <red> around </red> + * destructive actions (like e.g. deletion, formatting, ...) + * @param info record that gets filled with data + */ + virtual void getCommitInfo(bool mark_destructive, CommitInfo& info) const = 0; /** * Gets action performed last during previous call to commit() 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 Fri Oct 31 14:43:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 31 14:21:58 CET 2008 - aschnell(a)suse.de + +- added function getCommitInfo (for fate #302857) + +------------------------------------------------------------------- Thu Oct 30 16:50:16 CET 2008 - aschnell(a)suse.de - prior to creating file system check that volume is big enough -- 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] r52797 - /tags/stable-2_17_10/samba-client/
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 14:38:08 2008 New Revision: 52797 URL: http://svn.opensuse.org/viewcvs/yast?rev=52797&view=rev Log: Created tag stable-2_17_10 for samba-client Added: tags/stable-2_17_10/samba-client/ - copied from r52796, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52796 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/SambaConfig.pm src/SambaWinbind.pm
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 14:38:04 2008 New Revision: 52796 URL: http://svn.opensuse.org/viewcvs/yast?rev=52796&view=rev Log: - fixed reading /etc/security/pam_winbind.conf (bnc#433210) - do not restart dbus from YaST (bnc#395402) - 2.17.10 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/SambaConfig.pm trunk/samba-client/src/SambaWinbind.pm Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=52796&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Oct 31 14:38:04 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Oct 31 14:38:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 14:06:36 CET 2008 - jsuchome(a)suse.cz + +- fixed reading /etc/security/pam_winbind.conf (bnc#433210) +- do not restart dbus from YaST (bnc#395402) +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 15 14:36:15 CEST 2008 - jsuchome(a)suse.cz - updated help text for pam_mount configuration Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=5… ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Fri Oct 31 14:38:04 2008 @@ -460,8 +460,9 @@ */ global define boolean GetWinbindCaching () { - return SambaConfig::WinbindGlobalGetStr("cached_login", "") == "yes" && - SambaConfig::GlobalGetStr("winbind offline logon", "") == "yes"; + string cached = SambaConfig::WinbindGlobalGetStr ("cached_login", ""); + string offline = SambaConfig::GlobalGetStr ("winbind offline logon", ""); + return cached == "yes" && offline == "yes"; } /** Modified: trunk/samba-client/src/SambaConfig.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaConfig.pm?… ============================================================================== --- trunk/samba-client/src/SambaConfig.pm (original) +++ trunk/samba-client/src/SambaConfig.pm Fri Oct 31 14:38:04 2008 @@ -210,7 +210,7 @@ # read the complete global section $AllAtOnce = {}; - if (FileUtils->Exists ("/etc/security/winbind.conf")) { + if (FileUtils->Exists ("/etc/security/pam_winbind.conf")) { $AllAtOnce = SCR->Read(".etc.security_winbind.all"); } Modified: trunk/samba-client/src/SambaWinbind.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaWinbind.pm… ============================================================================== --- trunk/samba-client/src/SambaWinbind.pm (original) +++ trunk/samba-client/src/SambaWinbind.pm Fri Oct 31 14:38:04 2008 @@ -93,10 +93,6 @@ SCR->Execute (".target.bash", "/usr/sbin/nscd -i passwd"); SCR->Execute (".target.bash", "/usr/sbin/nscd -i group"); } - # restart D-BUS (#174589) FIXME this should be elsewhere - if (!$write_only && Service->Status ("dbus") == 0) { - Service->Restart ("dbus"); - } # restart zmd (#174589) FIXME this should be elsewhere if (!$write_only && PackageSystem->Installed ("zmd") && Service->Status ("novell-zmd") == 0) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0