October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51764 - in /trunk/yast2: library/packages/src/SlideShow.ycp package/yast2.changes
by visnov＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: visnov Date: Wed Oct 1 17:08:31 2008 New Revision: 51764 URL: http://svn.opensuse.org/viewcvs/yast?rev=51764&view=rev Log: - fix bnc#431261 Modified: trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Slide… ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Wed Oct 1 17:08:31 2008 @@ -685,6 +685,7 @@ } else { + // no tabs contents = DetailsPageWidgets(); } @@ -699,6 +700,10 @@ widgets_created = true; + // if no tabs, update the log + if( ShowingDetails() ) + RebuildDetailsView(); + if ( ! Slides::HaveSlides() && ShowingSlide() ) SwitchToDetailsView(); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Oct 1 17:08:31 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 17:07:00 CEST 2008 - visnov(a)suse.cz + +- Show old action logs when rebuilding slideshow dialog (bnc #431261) + +------------------------------------------------------------------- Tue Sep 30 15:27:45 CEST 2008 - tgoettlicher(a)suse.de - Fixed forgotten unregister from agent -- 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] r51763 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by kmachalkova＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: kmachalkova Date: Wed Oct 1 16:55:16 2008 New Revision: 51763 URL: http://svn.opensuse.org/viewcvs/yast?rev=51763&view=rev Log: Resizing partitions: error handling, logging Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 1 16:55:16 2008 @@ -5,6 +5,8 @@ * Authors: Arvin Schnell <aschnell(a)suse.de> */ { + include "partitioning/custom_part_lib.ycp"; + textdomain "storage"; @@ -454,6 +456,7 @@ //Depending on size of the partition, //set correct division factor and units + //and minimum required free space, too void AdjustUnits ( map size_data ) { @@ -474,10 +477,13 @@ map ret = size_data; ret["used"] = 0; ret["df_free"] = data["region",1]:0 * cyl_size; + ret["free"] = ret["df_free"]:0; return ret; } + //convert bytes to ints (i.e. numbers UI can understand) + //depending on current size scale integer ToUI (integer i) { return i / factor; @@ -520,18 +526,35 @@ // Heading for dialog heading = sformat(_("Resize Partition %1"), device); - map size_data = Storage::GetFreeSpace( device, 0, used_fs, true); - AdjustUnits( size_data ); + map size_data = $[]; if ( Partitions::IsSwapPartition( fsid ) ) + { size_data = AdjustSwapPartitionDf( size_data ); + } + else + { + size_data = Storage::GetFreeSpace( device, 0, used_fs, true); + if (size( size_data ) == 0 || !size_data["ok"]:false) + { + y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); + //FIXME: Really? + Popup::Error( sformat( _("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device )); + return false; + } + } + + AdjustUnits( size_data ); used = ToUI( size_data["used"]:0 ); free = ToUI( size_data["df_free"]:0 ); av_space =ToUI( av_space ); total = used + free + av_space; - // TODO: see texts in inst_custom_part.ycp + y2milestone("ResizePartition used %1, free %2, available %3, total %4", + Storage::ByteToHumanString(used), Storage::ByteToHumanString(free), + Storage::ByteToHumanString(av_space), Storage::ByteToHumanString(total) ); + } else if (flavour == `lv) { @@ -551,8 +574,6 @@ { content = `VBox( `BarGraph(`id(`graph), `opt(`vstretch), [used, free, av_space], BarGraphLabels() ), - //`Slider(`id(`new_size), `opt(`notify), sformat(_("New Size (in %1)"), unit), vg_min_free, - // (lv_used + free - lv_min_free), lv_used ) `Slider(`id(`new_size), `opt(`notify), sformat(_("New Size (in %1)"), unit), used+min_free, used + free + av_space, used+free) ); @@ -575,10 +596,6 @@ `VSpacing(1.0), `Left(`Label( sformat(_("Minimum Partition Size: %1 %2"), used + min_free, unit ))), `Left(`Label( sformat(_("Maximum Partition Size: %1 %2"), total, unit ))), - //`PartitionSplitter(lv_used, free, vg_free, vg_min_free, lv_min_free, - // bargraph_label_used, bargraph_label_free, - // bargraph_label_vg_free, field_label_free, - // field_label_vg_free), `HBox( `HStretch(), `PushButton(`id(`cancel), Label::CancelButton()), @@ -608,15 +625,31 @@ { if ( new_size != old_size ) { - //mark partition for resizing - data["resize"] = true; + string mountpoint = data["inactive"]:false ? "" : data["mount"]:""; + //calculate the difference list old_reg = data["region"]:[]; list new_reg = [ data["region",0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ]; - integer diff = old_reg[1]:0 - new_reg[1]:0; - y2internal("snehulak %1", diff); + + y2milestone("ResizePartition - new size %1 %2, in cylinders %3", new_size, unit, diff); data["region"] = new_reg; + + //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint + if ( !CheckResizePossible( false, false, diff, used_fs, mountpoint )) + { + //FIXME: To check whether the part. can be resized only + //after user tries to do that is stupid - in some cases + //we can tell beforehand, thus user should never get to this + //point (e.g. when the partition is mounted) + y2error("Resizing the partition is not possible"); + widget = `again; + } + else + { + //mark partition for resizing + data["resize"] = true; + } } break; } -- 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] r51762 - /trunk/ldap-server/src/helps.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 16:46:19 2008 New Revision: 51762 URL: http://svn.opensuse.org/viewcvs/yast?rev=51762&view=rev Log: Fixed HTML in online-help (bnc#430521) Modified: trunk/ldap-server/src/helps.ycp Modified: trunk/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/helps.ycp?rev=51… ============================================================================== --- trunk/ldap-server/src/helps.ycp (original) +++ trunk/ldap-server/src/helps.ycp Wed Oct 1 16:46:19 2008 @@ -52,7 +52,7 @@ administrative limit restrictions. Checking Append Base DN appends the Base DN entered above, for example, a base DN of <tt>dc=example,dc=com</tt> and Administrator DN of <tt>c=Admin</tt> would combine to an effective Administrator DN -of <tt>c=Admin,dc=example,dc=com</tt>. ") + +of <tt>c=Admin,dc=example,dc=com</tt>. ") + _("If this wizard was starteg during installation, the LDAP Administrator Password is initially set to the system's root password entered earlier in the installation process. ") + @@ -85,7 +85,7 @@ "ppolicy_edit" : _("<h3>Password Policy Settings</h3>") + _("To make use of password policies for this database, enable -Enable Password Policies.") + +Enable Password Policies.") + _("Check Hash Clear Text Passwords to specify that the OpenLDAP server should encrypt clear text passwords present in add and modify requests before storing them in the database. Note that this violates the X.500/LDAP information model, but may be -- 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] r51761 - in /trunk/qt: package/yast2-qt.changes src/YQUI.cc
by tgoettlicher＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: tgoettlicher Date: Wed Oct 1 16:32:27 2008 New Revision: 51761 URL: http://svn.opensuse.org/viewcvs/yast?rev=51761&view=rev Log: Write message to log when client is killed due to X server crash (bnc #414292) Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQUI.cc Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Oct 1 16:32:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 16:12:26 CEST 2008 - tgoettlicher(a)suse.de + +- Write message to log when client is killed due to X server crash + bnc #414292 + +------------------------------------------------------------------- Tue Sep 30 16:05:58 CEST 2008 - sh(a)suse.de - Move keyboard focus to default button (if there is one) when Modified: trunk/qt/src/YQUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.cc?rev=51761&r1=5176… ============================================================================== --- trunk/qt/src/YQUI.cc (original) +++ trunk/qt/src/YQUI.cc Wed Oct 1 16:32:27 2008 @@ -724,6 +724,10 @@ abort(); exit(1); // Qt does the same } + + if ( QString( msg ).contains( "Fatal IO error", Qt::CaseInsensitive ) && + QString( msg ).contains( "client killed", Qt::CaseInsensitive ) ) + yuiError() << "Client killed. Possibly caused by X server shutdown or crash." << endl; } -- 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] r51760 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 16:28:59 2008 New Revision: 51760 URL: http://svn.opensuse.org/viewcvs/yast?rev=51760&view=rev Log: - fixed repository rename, delete - fixed service rename - fixed UI - resize the richtext area so there is no scroll bar Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 16:28:59 2008 @@ -258,7 +258,7 @@ `Left(`Label(`id(`service), `opt(`hstretch), service)) ) : - `VSquash(`RichText(`id(`repo_info), "")); + `VSquash(`MinHeight(7, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -842,7 +842,6 @@ // update the current item current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); - y2internal("UI refresh done"); } else { @@ -910,7 +909,7 @@ // copy the refresh flag createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); if ( createResult == `ok ) { - deleteSource( current ); + deleteSource( global_current ); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); } @@ -919,7 +918,7 @@ { y2milestone ("URL is the same, not recreating the source"); sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); createResult = `ok; @@ -970,8 +969,9 @@ { y2milestone ("URL is the same, not recreating the service"); string entered_service_name = SourceDialogs::GetRepoName(); + string old_service_name = service_info["name"]:""; - if (service_info["name"]:nil != entered_service_name) + if (old_service_name != entered_service_name) { y2milestone("Updating name of the service to '%1'", entered_service_name); service_info["name"] = entered_service_name; @@ -980,6 +980,18 @@ fillCurrentRepoInfo(); createResult = `ok; + // update the reference + sourceStatesOut = maplist(map<string,any> src_state, sourceStatesOut, + { + if (src_state["service"]:"" == old_service_name) + { + src_state["service"] = entered_service_name; + } + + return src_state; + } + ); + // refresh also the tree widget UI::ChangeWidget(`id(`tree), `Items, buildTree()); } @@ -1091,7 +1103,7 @@ // yes-no popup if ( Popup::YesNo( _("Delete the selected repository from the list?") ) ) { - deleteSource( current ); + deleteSource(global_current); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); } -- 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] r51759 - /trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 16:10:27 2008 New Revision: 51759 URL: http://svn.opensuse.org/viewcvs/yast?rev=51759&view=rev Log: show specific error details Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Wed Oct 1 16:10:27 2008 @@ -60,7 +60,7 @@ y2error ("user name is empty!"); return `back; } - string bir_path = Directory::tmpdir + "/" + username + ".bir"; + string fingerprint_dir = Directory::tmpdir + "/" + username + "/"; term contents = `HBox (`HSpacing (1.5), `VBox( `VSpacing(0.5), @@ -117,7 +117,6 @@ } // helper function, form the string for UI from actuall data - // FIXME we don't know number of remaining swipes... void replace_swipe_string () { UI::ReplaceWidget (`id (`rpstatus), `Label ( @@ -134,61 +133,28 @@ } - if (SCR::Execute (.fprint.enroll, bir_path) != true) + if (SCR::Execute (.fprint.enroll, fingerprint_dir) != true) { ui = `cancel; // status message UI::ReplaceWidget (`id (`rp), `Label (_("Initialization of fingerprint reader failed."))); } -// FIXME show generic message... the user can enroll finger + else + status_message ( + // status label + _("Device initialized."), + // status message + _("Swipe your right index finger.")); + while (ui != `cancel) { map statemap = (map) SCR::Read (.fprint.state); if (statemap != nil && statemap != $[]) { integer state = statemap["state"]:0; -y2security ("state: %1", state); + y2milestone ("state: %1", state); switch (state) { - /* - case 8: { // TF_STATE_ACQUIRE_SUCCESS - UI::ReplaceWidget (`id (`rp), - // status label - `Label (_("Storing data..."))); - UI::ReplaceWidget (`id (`rpstatus), `VSpacing ()); - exit = true; - break; - } - case 7: { // TF_STATE_ENROLL_SUCCESS - UI::ReplaceWidget (`id (`rp), - // status label - `Label (_("Storing data..."))); - UI::ReplaceWidget (`id (`rpstatus), `VSpacing ()); - exit = true; - break; - } - case 9: { // TF_STATE_ACQUIRE_FAILED - UI::ReplaceWidget (`id (`rp), - `Label (_("Acquiring fingerprint failed."))); - exit = true; - break; - } - case 2: { // TF_STATE_SWIPE_0 - UI::ReplaceWidget (`id (`rp), - `Label (_("Please swipe your finger..."))); - break; - } - case 5: { // TF_STATE_SWIPE_SUCCESS - swipe_success = swipe_success + 1; - replace_swipe_string (); - break; - } - case 6: { // TF_STATE_SWIPE_AFILED - swipe_failed = swipe_failed + 1; - replace_swipe_string (); - break; - } - */ case 1: { // FP_ENROLL_COMPLETE UI::ReplaceWidget (`id (`rp), // status label @@ -197,7 +163,7 @@ exit = true; break; } - case 2: { // FP_ENROLL_FAILED ?? FIXME + case 2: { // FP_ENROLL_FAILED status_message ( // status label _("Scan failed."), @@ -207,7 +173,7 @@ } case 3: { // FP_ENROLL_PASS swipe_success = swipe_success + 1; -// replace_swipe_string (); +// replace_swipe_string (); FIXME status_message ( // status label @@ -300,7 +266,17 @@ // error message, part 1 string error = _("Could not acquire fingerprint."); string details = ""; - if (exit_status == 253) + // see the error exit values in FPrintAgent.cc + if (exit_status == 200) + // error message, part 2 + details = _("Initialization failed."); + else if (exit_status == 201) + // error message, part 2 + details = _("No devices detected."); + else if (exit_status == 202) + // error message, part 2 + details = _("Device could not be opened."); + else if (exit_status == 253) // error message, part 2 details = _("USB error occured."); else if (exit_status == 254) @@ -308,9 +284,7 @@ details = _("Communication with fingerprint reader failed."); if (exit_status != 256) { - UI::ReplaceWidget (`id (`rp), `Label (error)); - if (details != "") - UI::ReplaceWidget (`id (`rpstatus), `Label (details)); + status_message (error, details); } Wizard::EnableBackButton (); } @@ -318,10 +292,9 @@ ret = UI::UserInput (); if (ret == `next) { - // FIXME no bir file can be defined yet FIXME // modified data to add to user map<string, any> tmp_data = $[ - "bir_file" : username, + "_fingerprint_dir" : fingerprint_dir, // FIXME save correctly "plugin_modified" : 1 ]; if (data["what"]:"" == "edit_user") -- 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] r51758 - /tags/stable-2_17_16/installation/
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:09:48 2008 New Revision: 51758 URL: http://svn.opensuse.org/viewcvs/yast?rev=51758&view=rev Log: Created tag stable-2_17_16 for installation Added: tags/stable-2_17_16/installation/ - copied from r51757, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51757 - /trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 16:09:35 2008 New Revision: 51757 URL: http://svn.opensuse.org/viewcvs/yast?rev=51757&view=rev Log: setenv (HOME) to force saving data in tmp directory better error handling Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/… ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Wed Oct 1 16:09:35 2008 @@ -11,9 +11,11 @@ #define PC(n) (path->component_str(n)) -#define INIT_FAILED 500 -#define SET_FILE_FAILED 600 -#define SET_CALLBACK_FAILED 700 +// error exit values of the child process +#define INIT_FAILED 200 +#define NO_DEVICES 201 +#define DEVICE_OPEN_FAILED 202 +#define ENROLL_FAILURE 255 /** @@ -71,63 +73,70 @@ * wrapper for fp_enroll_finger function; * - we need to take care of the errors and signals * @param file descriptor of the pipe - * @param path to the target bir file FIXME + * @param path to the temporary directory for storing fingerprints */ -int FPrintAPI::acquire (int write_fd, string bir_path) +int FPrintAPI::acquire (int write_fd, string dir_path) { + // catch the abort signal to make proper cleanup signal (15, catch_sigterm); -// FIXME move initialization to separate call, to differentiate betw.ret values - struct fp_print_data *enrolled_print = NULL; int r; - struct fp_dscv_dev *ddev; - struct fp_dscv_dev **discovered_devs; - struct fp_dev *dev; - - r = fp_init(); - if (r < 0) { - y2error("Failed to initialize libfprint\n"); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } - discovered_devs = fp_discover_devs(); - if (!discovered_devs) { - y2error("Could not discover devices\n"); - instance().finalize (); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } - - ddev = discovered_devs[0]; + struct fp_dscv_dev *ddev; + struct fp_dscv_dev **discovered_devs; + struct fp_dev *dev; + + r = fp_init(); + if (r < 0) { + y2error("Failed to initialize libfprint"); + r = INIT_FAILED; + write (write_fd, &r, sizeof(int)); + return r; + } + + discovered_devs = fp_discover_devs(); + if (!discovered_devs) { + y2error("Could not discover devices"); + instance().finalize (); + r = NO_DEVICES; + write (write_fd, &r, sizeof(int)); + return r; + } + ddev = discovered_devs[0]; - if (!ddev) { - y2error("No devices detected.\n"); - instance().finalize (); - r = INIT_FAILED; - write (write_fd, &r, sizeof(int)); - return r; - } + if (!ddev) { + y2error("No devices detected."); + instance().finalize (); + r = NO_DEVICES; + write (write_fd, &r, sizeof(int)); + return r; + } + /* struct fp_driver *drv; drv = fp_dscv_dev_get_driver(ddev); y2milestone ("Found device claimed by %s driver", fp_driver_get_full_name(drv)); + */ - dev = fp_dev_open(ddev); - fp_dscv_devs_free(discovered_devs); - if (!dev) { - y2error("Could not open device.\n"); - } + dev = fp_dev_open(ddev); + fp_dscv_devs_free(discovered_devs); + if (!dev) { + y2error("Could not open device."); + instance().finalize (); + r = DEVICE_OPEN_FAILED; + write (write_fd, &r, sizeof(int)); + return r; + } - y2milestone("Opened device. It's now time to enroll your finger.\n\n"); + y2milestone ("Device opened successfully."); + /* TODO how to pass the info about stages number to the parent? y2milestone ("You will need to successfully scan your finger %d times to " - "complete the process.\n", fp_dev_get_nr_enroll_stages (dev)); + "complete the process.", fp_dev_get_nr_enroll_stages (dev)); + */ do { sleep (1); @@ -140,7 +149,7 @@ y2error ("Enroll failed with error %d", r); instance().finalize (); signal (15, SIG_DFL); - return r; + return ENROLL_FAILURE; } if (write (write_fd, &r, sizeof (int)) == -1) @@ -155,7 +164,7 @@ y2milestone("Enroll failed, something wen't wrong :("); instance().finalize (); signal (15, SIG_DFL); - return r; + return ENROLL_FAILURE; case FP_ENROLL_PASS: y2milestone("Enroll stage passed. Yay!"); break; @@ -175,12 +184,20 @@ } while (r != FP_ENROLL_COMPLETE); if (!enrolled_print) { - y2error ("Enroll complete but no print?\n"); + y2error ("Enroll complete but print is null"); + r = ENROLL_FAILURE; } else { + // set the HOME to temporary path we know from argument + setenv ("HOME", dir_path.c_str(), 1); data = enrolled_print; + int save_r = fp_print_data_save (data, RIGHT_INDEX); + if (save_r < 0) + { + y2error ("Data save failed with %d", r); + r = save_r; + } y2milestone ("Enrollment completed, exiting with %d", r); - // FIXME save enrolled_print now } instance().finalize (); @@ -231,7 +248,7 @@ } else if (retval == size) { if (state == INIT_FAILED || - state == SET_FILE_FAILED || state == SET_CALLBACK_FAILED) + state == NO_DEVICES || state == DEVICE_OPEN_FAILED) { y2warning ("some initialization failed (%d)...", state); return ret; @@ -377,7 +394,7 @@ } else { - y2error ("path to bir file is missing"); + y2error ("path to tmp directory is missing"); return ret; } if (pipe (data_pipe) == -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] r51756 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 16:08:50 2008 New Revision: 51756 URL: http://svn.opensuse.org/viewcvs/yast?rev=51756&view=rev Log: preparing 2.17.9 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=51756&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Wed Oct 1 16:08:50 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Wed Oct 1 16:08:50 2008 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Oct 1 16:01:24 CEST 2008 - rhafer(a)suse.de + +- Verstion 2.17.9 + * revived commandline support (bnc#429486) + * additional checks when adding .schema files (bnc#431168) + * workaround for Firewall-Widget in installation proposal + (bnc#428364) + * fixed regression in initial server configuration (bnc#431250) + * use ldap-server icon in all wizards (bnc#431210) + * adjust size of Warning Popup (bnc#431228) + +------------------------------------------------------------------- Mon Sep 29 13:03:41 CEST 2008 - rhafer(a)suse.de - Version 2.17.8 -- 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] r51755 - /tags/stable-2_17_34/network/
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:06:11 2008 New Revision: 51755 URL: http://svn.opensuse.org/viewcvs/yast?rev=51755&view=rev Log: Created tag stable-2_17_34 for network Added: tags/stable-2_17_34/network/ - copied from r51754, trunk/network/ -- 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] r51754 - in /trunk/installation: VERSION package/yast2-installation.changes startup/Second-Stage/S07-medium
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:04:54 2008 New Revision: 51754 URL: http://svn.opensuse.org/viewcvs/yast?rev=51754&view=rev Log: use rpcbind instead of portmap for nfs installation (bnc#423026) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=51754&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Oct 1 16:04:54 2008 @@ -1 +1 @@ -2.17.15 +2.17.16 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 Wed Oct 1 16:04:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 16:03:32 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.16 + +------------------------------------------------------------------- Wed Oct 1 15:41:12 CEST 2008 - jsuchome(a)suse.cz - if nn_NO language is selected, use nb_NO in YaST (bnc#426124) Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Wed Oct 1 16:04:54 2008 @@ -25,7 +25,7 @@ if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then log "\tnetwork configuration found -> activate network" rcnetwork start -o onboot && Y2_NETWORK_ACTIVE=1 - [ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + [ -f /var/lib/YaST2/network_install_rpcbind ] && rcrpcbind start fi #============================================= -- 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] r51753 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 16:03:17 2008 New Revision: 51753 URL: http://svn.opensuse.org/viewcvs/yast?rev=51753&view=rev Log: use rpcbind instead of portmap for nfs installation (bnc#423026) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=51753&r1=517… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 1 16:03:17 2008 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 1 16:03:17 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 15:57:16 CEST 2008 - mzugec(a)suse.de + +- use rpcbind instead of portmap for nfs installation (bnc#423026) +- 2.17.34 + +------------------------------------------------------------------- Wed Oct 1 14:13:17 CEST 2008 - mzugec(a)suse.de - use Service::Restart instead of bash agent Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Oct 1 16:03:17 2008 @@ -444,7 +444,7 @@ // if portmap running - start it after reboot WFM::Execute (.local.bash, - "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind"); } -- 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] r51752 - /trunk/ldap-server/src/complex.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 16:01:20 2008 New Revision: 51752 URL: http://svn.opensuse.org/viewcvs/yast?rev=51752&view=rev Log: reformated popup text make the window smaller (bnc#431228) Modified: trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Wed Oct 1 16:01:20 2008 @@ -170,7 +170,11 @@ } else if ( !serviceEnabled || !serviceRunning ) { - symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not currently running."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); + symbol ret = Popup::AnyQuestion3( _("Existing configuration detected."), + _("You have an existing configuration, but the LDAP server is currently not running. +Do you want to start the server now and re-read its configuration data or do you +want to create a new configuration from scratch?"), + _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { LdapServer::WriteServiceEnabled( true ); -- 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] r51751 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 15:58:09 2008 New Revision: 51751 URL: http://svn.opensuse.org/viewcvs/yast?rev=51751&view=rev Log: - fixed problems when only repositories from the selected service were displayed Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 15:58:09 2008 @@ -120,6 +120,15 @@ return (priority == default_priority) ? _("Default") : tostring(priority); } + list<map<string,any> > ReposFromService(string service, list<map<string,any> > input) + { + return filter(map<string,any> repo, input, + { + return repo["service"]:"" == service; + } + ); + } + /** Create a table item from a map as returned by the InstSrcManager agent. @param source The map describing the source as returned form the agent. @@ -132,8 +141,8 @@ y2internal("Item: %1", source); - string name = repository_mode ? (haskey(sourceStatesOut[index]:$[], "name") ? - sourceStatesOut[index,"name"]:"" : + string name = repository_mode ? (haskey(source, "name") ? + source["name"]:"" : // unkown name (alias) of the source generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name")) : source["name"]:""; @@ -169,20 +178,16 @@ map generalData = Pkg::SourceGeneralData( id ); y2milestone("generalData(%1): %2", id, generalData); - string alias = haskey(sourceStatesOut[index]:$[], "name") ? - sourceStatesOut[index,"name"]:"" : - // unkown name (alias) of the source - generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name"); - // get the editable propertis from 'source' parameter, // get the fixed propertis from the package manager map<string,any> out = $[ "enabled" : source["enabled"]:true, "autorefresh" : source["autorefresh"]:true, - "name" : alias, + "name" : source["name"]:_("Unknown Name"), "url" : generalData[ "url" ]:"", "type" : generalData["type"]:"", "priority" : source["priority"]:default_priority, + "service" : source["service"]:"", ]; return out; @@ -203,16 +208,12 @@ RemoveDeletedAddNewRepos(); } - list<map> itemList = repo_mode ? sourceStatesOut : serviceStatesOut; + list<map<string,any> > itemList = repo_mode ? sourceStatesOut : serviceStatesOut; // displaye only repositories from the selected service if (repo_mode && service_name != "") { - itemList = filter(map repo, itemList, - { - return repo["service"]:"" == service_name; - } - ); + itemList = ReposFromService(service_name, itemList); y2internal("table items: %1", itemList); } @@ -225,6 +226,8 @@ i = i + 1; } + y2internal("New table content: %1", items); + UI::ChangeWidget( `id( `table ), `Items, items ); } @@ -260,6 +263,8 @@ void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) { + y2internal(-1, "fillRepoInfo: index: %1, source; %2, repo_mode: %3, service_name: %4", + index, source, repo_mode, service_name); map<string,any> info = repo_mode ? getSourceInfo (index, source) : source; y2internal("getSourceInfo(%1, %2): %3", index, source, info); @@ -277,7 +282,7 @@ if (service != "") { - sformat (_("Service: %1"), service); + service = sformat (_("Service: %1"), service); } // don't display category for services @@ -340,7 +345,11 @@ return; } - map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[]; + map data = (repository_view) ? + ((displayed_service == "") ? sourceStatesOut[selected]:$[] : + ReposFromService(displayed_service, sourceStatesOut)[selected]:$[] + ) + : serviceStatesOut[selected]:$[]; fillRepoInfo (selected, data, repository_view, displayed_service); } @@ -843,25 +852,31 @@ map<string, any> sourceState = $[]; + // global_current - 'current' that points to global sourceStatesOut + integer global_current = -1; + if (repository_view) { if (displayed_service == "") { sourceState = sourceStatesOut[ current ]:$[]; + global_current = current; } else { if (current != nil) { - list<map<string,any> > sources_from_service = sourceStatesOut; + list<map<string,any> > sources_from_service = ReposFromService(displayed_service, sourceStatesOut); + sourceState = sources_from_service[current]:$[]; - sources_from_service = filter(map<string,any> src, sources_from_service, + find(map<string,any> s, sourceStatesOut, { - return src["service"]:"" == displayed_service; + global_current = global_current + 1; + return s["SrcId"]:nil == sourceState["SrcId"]:-1; } ); - sourceState = sources_from_service[current]:$[]; + y2milestone("global_current: %1", global_current); } } } @@ -997,11 +1012,15 @@ } else if ( input == `autorefresh_all || input == `refresh_enabled) { - y2milestone("Refreshing all %1 repositories...", input == `refresh_enabled ? "enabled" : "autorefreshed"); + y2milestone("Refreshing all %1 %2%3...", input == `refresh_enabled ? "enabled" : "autorefreshed", + repository_view ? "repositories" : "services", + repository_view && displayed_service != "" ? " from service " + displayed_service : ""); boolean refresh_autorefresh_only = input == `autorefresh_all; integer to_refresh = 0; +// TODO FIXME list<map<string,any> > data = + foreach(map<string,any> src_state, sourceStatesOut, { if (src_state["enabled"]:false && (!refresh_autorefresh_only || src_state["autorefresh"]:false)) @@ -1101,7 +1120,7 @@ string newstate = ( state ? UI::Glyph (`CheckMark) : ""); UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); sourceState[ "enabled" ] = state; - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; if (full_mode) { @@ -1135,14 +1154,14 @@ { integer source_id = sourceState["SrcId"]:0; map src_data = Pkg::SourceGeneralData (source_id); - string type = src_data["type"]:"UnitedLinux"; + string type = src_data["type"]:""; boolean state = sourceState[ "autorefresh" ]:true; if (type == "PlainDir" && ! state) { // popup message Popup::Message (_("For the selected repository, refresh - cannot be set.")); +cannot be set.")); } else { @@ -1153,27 +1172,23 @@ } sourceState["autorefresh"] = state; - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; } else { - if (displayed_service == "") - { - map<string,any> srv = serviceStatesOut[current]:$[]; - y2internal("Selected service: %1", srv); + map<string,any> srv = serviceStatesOut[current]:$[]; + y2internal("Selected service: %1", srv); - boolean state = srv["autorefresh"]:false; - state = !state; + boolean state = srv["autorefresh"]:false; + state = !state; - // update the table - string newstate = ( state ? UI::Glyph (`CheckMark) : ""); - UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); + // update the table + string newstate = ( state ? UI::Glyph (`CheckMark) : ""); + UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate ); - // store the change - srv["autorefresh"] = state; - serviceStatesOut[current] = srv; - } - // TODO else... + // store the change + srv["autorefresh"] = state; + serviceStatesOut[current] = srv; } // do not refresh the item in the table @@ -1181,16 +1196,23 @@ } else if (input == `priority) { - // refresh the value in the table - integer new_priority = (integer)UI::QueryWidget(`id(`priority), `Value); - y2debug("New priority: %1", new_priority); - - UI::ChangeWidget( `id( `table ), `Item( current, 0 ), PriorityToString(new_priority)); - sourceState[ "priority" ] = new_priority; - sourceStatesOut[ current ] = sourceState; + if (repository_view) + { + // refresh the value in the table + integer new_priority = (integer)UI::QueryWidget(`id(`priority), `Value); + y2debug("New priority: %1", new_priority); + + UI::ChangeWidget( `id( `table ), `Item( current, 0 ), PriorityToString(new_priority)); + sourceState[ "priority" ] = new_priority; + sourceStatesOut[ global_current ] = sourceState; - // do not refresh the item in the table - current = -1; + // do not refresh the item in the table + current = -1; + } + else + { + y2error("Ignoring event `priority: the widget should NOT be displayed in service mode!"); + } } else { -- 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] r51750 - in /trunk/ldap-server/src: dialogs.ycp wizards.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 15:46:49 2008 New Revision: 51750 URL: http://svn.opensuse.org/viewcvs/yast?rev=51750&view=rev Log: use correct Icon (bnc#431210) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Oct 1 15:46:49 2008 @@ -322,6 +322,7 @@ //close service dialog // UI::CloseDialog(); Wizard::CreateTreeDialog(); + Wizard::SetDesktopIcon("ldap-server"); //item selected at start current_tree_item = "daemon"; Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Wed Oct 1 15:46:49 2008 @@ -44,6 +44,7 @@ ] ]; + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); return ret; @@ -55,6 +56,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -95,6 +97,7 @@ term contents = `Label(_("Initializing...")); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); @@ -183,6 +186,7 @@ y2milestone( "--> starting MigrateSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); y2milestone( "--> MigrateSequence finished " ); @@ -240,6 +244,7 @@ ]; Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); any ret = Sequencer::Run(aliases, sequence); @@ -262,6 +267,7 @@ y2milestone ( "--> starting LdapServerAutoSequence" ); Wizard::CreateDialog(); + Wizard::SetDesktopIcon("ldap-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); -- 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] r51749 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:43:09 2008 New Revision: 51749 URL: http://svn.opensuse.org/viewcvs/yast?rev=51749&view=rev Log: - if nn_NO language is selected, use nb_NO in YaST (bnc#426124) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Oct 1 15:43:09 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 15:41:12 CEST 2008 - jsuchome(a)suse.cz + +- if nn_NO language is selected, use nb_NO in YaST (bnc#426124) + +------------------------------------------------------------------- Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz - Changing pattern "Documentation" to "documentation" (bnc #431218) Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Wed Oct 1 15:43:09 2008 @@ -239,7 +239,14 @@ Language::WfmSetGivenLanguage ("en_US"); } else if (ret == `language) { Console::SelectFont (language); - Language::WfmSetLanguage (); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using BokmÃ¥l"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); } } -- 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] r51748 - /tags/stable-2_17_11/ldap-client/
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:35:59 2008 New Revision: 51748 URL: http://svn.opensuse.org/viewcvs/yast?rev=51748&view=rev Log: Created tag stable-2_17_11 for ldap-client Added: tags/stable-2_17_11/ldap-client/ - copied from r51747, trunk/ldap-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] r51747 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/LdapPopup.ycp
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 15:35:55 2008 New Revision: 51747 URL: http://svn.opensuse.org/viewcvs/yast?rev=51747&view=rev Log: - fixed help text (bnc#430521) - 2.17.11 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/LdapPopup.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=51747&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Oct 1 15:35:55 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Oct 1 15:35:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 15:11:55 CEST 2008 - jsuchome(a)suse.cz + +- fixed help text (bnc#430521) +- 2.17.11 + +------------------------------------------------------------------- Thu Sep 25 09:07:58 CEST 2008 - jsuchome(a)suse.cz - do not restart dbus service, reload it (bnc#429520) Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed Oct 1 15:35:55 2008 @@ -577,7 +577,7 @@ _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be checked at all. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + // help text for pwdMinLength attribute _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), -- 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] r51746 - /trunk/devtools/yast2/check_ycp/check_ycp
by sh-sh-sh＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: sh-sh-sh Date: Wed Oct 1 15:34:25 2008 New Revision: 51746 URL: http://svn.opensuse.org/viewcvs/yast?rev=51746&view=rev Log: removed counterproductive check Modified: trunk/devtools/yast2/check_ycp/check_ycp Modified: trunk/devtools/yast2/check_ycp/check_ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2/check_ycp/check_y… ============================================================================== --- trunk/devtools/yast2/check_ycp/check_ycp (original) +++ trunk/devtools/yast2/check_ycp/check_ycp Wed Oct 1 15:34:25 2008 @@ -385,15 +385,6 @@ my $line_no = count_lines( $header ) + 1; - # Check for $ Id $ marker - - if ( $header !~ m{[\$]Id.*[\$]}m ) - { - warning( $line_no, "No \$" . "Id" . "\$ CVS/Subversion marker in header" ); - - } - - # Check for "Author(s)" or "Maintainer(s)" entries my $author_count = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r51745 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 15:14:00 2008 New Revision: 51745 URL: http://svn.opensuse.org/viewcvs/yast?rev=51745&view=rev Log: fixed test if the configration is still using the defaults-hash or if it has been read from libslapdconf (bnc#431250) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Oct 1 15:14:00 2008 @@ -34,6 +34,7 @@ my %error = ( msg => undef, details => undef ); my $usingDefaults = 1; +my $readConfig = 0; my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; @@ -231,6 +232,7 @@ SCR->Execute('.ldapserver.init' ); my $rc = SCR->Read('.ldapserver.databases'); $usingDefaults = 0; + $readConfig = 1; } else { @@ -936,7 +938,7 @@ # Configuration summary text for autoyast my $self = shift; my $string; - if ( keys(%dbDefaults) && $usingDefaults ) + if ( keys(%dbDefaults) && ! $readConfig ) { $string .= '<h2>'._("Startup Configuration").'</h2>' .''._("Start LDAP Server: ").'<code>'.($dbDefaults{'serviceEnabled'}->value?_("Yes"):_("No")).'</code>' @@ -1421,6 +1423,7 @@ { bind_dn => $dbDefaults{'rootdn'}, bind_pw => $dbDefaults{'rootpw_clear'} } ); $usingDefaults = 0; + $readConfig = 1; return 1; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Oct 1 15:14:00 2008 @@ -111,6 +111,7 @@ return ConfigToLdif(); } } catch ( std::runtime_error e ) { + y2error("Error during Read: %s", e.what() ); lastError->add(YCPString("summary"), YCPString(std::string( e.what() ) ) ); lastError->add(YCPString("description"), YCPString("") ); return YCPBoolean(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] r51744 - /trunk/network/src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 15:02:42 2008 New Revision: 51744 URL: http://svn.opensuse.org/viewcvs/yast?rev=51744&view=rev Log: fixed parameter in Service (rcnetwork instead of network) Modified: trunk/network/src/modules/Lan.ycp Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Oct 1 15:02:42 2008 @@ -436,7 +436,7 @@ // NetworkModules::HwUp (); // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) Service::Restart("rcnetwork"); + else if (LanItems::force_restart) Service::Restart("network"); else if(Service::Status("network")==0){ Service::Reload("network"); } else Service::Restart("network"); -- 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] r51743 - /trunk/audit-laf/src/helps.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 14:52:14 2008 New Revision: 51743 URL: http://svn.opensuse.org/viewcvs/yast?rev=51743&view=rev Log: fixed typo Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5174… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Wed Oct 1 14:52:14 2008 @@ -91,7 +91,7 @@ gets all audit events on stdin.") + /* dispatcher dialog help 3/3 */ _("Communication: Controls the communication -between the daemon and the dispatcher program."), +between the daemon and the dispatcher program."), /* disk space dialog help 1/4 */ "diskspace_settings" : _("<big>Auditd Disk Space Configuration</big> -- 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] r51742 - /trunk/yast2/library/modules/Popup.ycp
by sh-sh-sh＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: sh-sh-sh Date: Wed Oct 1 14:24:33 2008 New Revision: 51742 URL: http://svn.opensuse.org/viewcvs/yast?rev=51742&view=rev Log: fixed syntax error (doesn't anybody do _any_ testing any more???) Modified: trunk/yast2/library/modules/Popup.ycp Modified: trunk/yast2/library/modules/Popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Popup.ycp?… ============================================================================== --- trunk/yast2/library/modules/Popup.ycp (original) +++ trunk/yast2/library/modules/Popup.ycp Wed Oct 1 14:24:33 2008 @@ -330,6 +330,10 @@ ); any ret = nil; + + if ( focus != nil ) + UI::SetFocus(focus); + if (success == true) { ret = UI::UserInput(); UI::CloseDialog(); -- 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] r51741 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgList.cc
by tgoettlicher＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: tgoettlicher Date: Wed Oct 1 14:22:30 2008 New Revision: 51741 URL: http://svn.opensuse.org/viewcvs/yast?rev=51741&view=rev Log: Fixed bnc #418279: export list to text file fails Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Oct 1 14:22:30 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:59:45 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418279: export list to text file fails + +------------------------------------------------------------------- Fri Sep 26 16:53:35 CEST 2008 - kmachalkova(a)suse.cz - Fixed crash in Languages filter: redefined sort function for Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=5174… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Wed Oct 1 14:22:30 2008 @@ -428,51 +428,51 @@ // wrong, so the formatting will be broken. QString header; - header.sprintf( "# %-18s %-30s | %10s | %-16s | %-16s\n\n", + header.sprintf( "# %-18s %-30s | %-40s | %-25s | %10s\n\n", (const char *) _( "Status" ).toUtf8(), (const char *) _( "Package" ).toUtf8(), - (const char *) _( "Size" ).toUtf8(), - (const char *) _( "Avail. Ver." ).toUtf8(), - (const char *) _( "Inst. Ver." ).toUtf8() + (const char *) _( "Summary" ).toUtf8(), + (const char *) _( "Installed (Available)" ).toUtf8(), + (const char *) _( "Size" ).toUtf8() ); file.write(header.toUtf8()); - // // Write all items - // -#if FIXME - const QTreeWidgetItem * item = firstChild(); - - while ( item ) + QTreeWidgetItemIterator it((QTreeWidget*) this); + while (*it) { - const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - - if ( pkg ) - { - QString candVersion = pkg->text( versionCol() ); - QString instVersion = pkg->text( instVersionCol() ); + const QTreeWidgetItem* item(*it); + const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - if ( candVersion.isEmpty() ) candVersion = "---"; - if ( instVersion.isEmpty() ) instVersion = "---"; + if ( pkg ) + { + QString version = pkg->text(versionStatusCol()); + if ( version.isEmpty() ) version = "---"; + + QString summary = pkg->text(summaryCol()); + if ( summary.isEmpty() ) summary = "---"; + if ( summary.size() > 40 ) + { + summary.truncate(40-3); + summary += "..."; + } - QString status = "[" + statusText( pkg->status() ) + "]"; + QString status = "[" + statusText( pkg->status() ) + "]"; QString format; - format.sprintf("%-20s %-30s | %10s | %-16s | %-16s\n", - (const char *) status.toUtf8(), - (const char *) pkg->text( nameCol() ), - (const char *) pkg->text( sizeCol() ), - (const char *) candVersion, - (const char *) instVersion + format.sprintf("%-20s %-30s | %-40s | %-25s | %10s\n", + (const char*) status.toUtf8(), + (const char*) pkg->text( nameCol() ).toUtf8(), + (const char*) summary.toUtf8(), + (const char*) version.toUtf8(), + (const char*) pkg->text( sizeCol() ).toUtf8() ); file.write(format.toUtf8()); } - - item = item->nextSibling(); + ++it; } -#endif // Clean up if ( file.isOpen() ) -- 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] r51740 - /tags/stable-2_17_33/network/
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 14:16:58 2008 New Revision: 51740 URL: http://svn.opensuse.org/viewcvs/yast?rev=51740&view=rev Log: Created tag stable-2_17_33 for network Added: tags/stable-2_17_33/network/ - copied from r51739, trunk/network/ -- 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] r51739 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mzugec Date: Wed Oct 1 14:16:48 2008 New Revision: 51739 URL: http://svn.opensuse.org/viewcvs/yast?rev=51739&view=rev Log: - use Service::Restart instead of bash agent - don't restart network twice in Lan::Write() Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=51739&r1=517… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 1 14:16:48 2008 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 1 14:16:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 1 14:13:17 CEST 2008 - mzugec(a)suse.de + +- use Service::Restart instead of bash agent +- don't restart network twice in Lan::Write() +- 2.17.33 + +------------------------------------------------------------------- Thu Sep 25 19:28:57 CEST 2008 - mzugec(a)suse.de - copy udev files for s390 (bnc#422150) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Wed Oct 1 14:16:48 2008 @@ -326,7 +326,7 @@ global define boolean Write() { y2milestone("Writing configuration"); - if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); +// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -403,10 +403,6 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); - // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup DNS::Write(); @@ -438,7 +434,13 @@ /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); // NetworkModules::HwUp (); - NetworkService::StartStop (); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) Service::Restart("rcnetwork"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } else Service::Restart("network"); +// NetworkService::StartStop (); sleep(sl); } -- 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] r51738 - in /trunk/ldap-server/src: dialogs.ycp ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:34 2008 New Revision: 51738 URL: http://svn.opensuse.org/viewcvs/yast?rev=51738&view=rev Log: create temporary service file for the Firewall-Widget to work (bnc#428364) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Oct 1 14:06:34 2008 @@ -194,7 +194,7 @@ { map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ - "services": [ "ldap" , "ldaps" ], + "services": [ "service:openldap" ], "display_details": true, ]; map<string, any> firewall_widget = Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Wed Oct 1 14:06:34 2008 @@ -59,6 +59,12 @@ { y2milestone ("Openldap2 is not installed. --> service disabled"); LdapServer::WriteServiceEnabled (false); + // temporarly create the services file for the Firewallsettings + if (SCR::Read(.target.size, "/etc/sysconfig/SuSEfirewall2.d/services/openldap") <= 0) + { + SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/openldap", + "TCP=\"ldap ldaps\"\nUDP=\"ldap\"\n" ); + } } else { @@ -101,7 +107,7 @@ y2milestone("Zones used by firewall: %1", used_zones); foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("ldap", zone)) + if (SuSEFirewall::IsServiceSupportedInZone ("service:openldap", zone)) is_ldap_enabled = true; }); } @@ -179,6 +185,11 @@ else if(func == "Write") { if( LdapServer::Configured() ) return ret; + if (!Package::Installed ("openldap2")) + { + //remove temp file + SCR::Execute(.target.remove, "/etc/sysconfig/SuSEfirewall2.d/services/openldap"); + } if( LdapServer::ReadServiceEnabled() ) { /* ensure openldap2 package is installed */ -- 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] r51737 - in /trunk/ldap-server/src: LdapServer.pm ldap-server.ycp
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:31 2008 New Revision: 51737 URL: http://svn.opensuse.org/viewcvs/yast?rev=51737&view=rev Log: revive commandline support (bnc#429486) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/ldap-server.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Oct 1 14:06:31 2008 @@ -656,6 +656,11 @@ Progress->Finish(); return 1; } + if ( ! $wasEnabled && $serviceEnabled ) + { + Service->Enable("ldap"); + Service->Start("ldap"); + } my $progressItems = [ _("Writing Sysconfig files"), _("Applying changes to Configuration Database"), _("Applying changes to /etc/openldap/ldap.conf"), @@ -1419,6 +1424,13 @@ return 1; } +## + # Read the list of configured Databases. + # + # @return A list of hashes. Each hash represents a database and has the keys + # 'type' (e.g. "hdb" or "bdb"), 'suffix' (the base DN of the database) and + # 'index' (the index number used by back-config to order databases correctly) + # BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } sub ReadDatabaseList { Modified: trunk/ldap-server/src/ldap-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.ycp?… ============================================================================== --- trunk/ldap-server/src/ldap-server.ycp (original) +++ trunk/ldap-server/src/ldap-server.ycp Wed Oct 1 14:06:31 2008 @@ -34,22 +34,23 @@ ["enable", "disable" ] ); if( command == nil ) return false; -// LdapServer::WriteServiceEnabled( command == "enable" ); + LdapServer::WriteServiceEnabled( command == "enable" ); return true; } define boolean getDatabaseListHandler (map options) { -// map<string, any> edb = LdapServer::ReadDatabase(); -// -// string s = ""; -// foreach( string suffix, any value, edb, -// { -// s = s + suffix + " "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + list<map<string, string> > dbList = LdapServer::ReadDatabaseList(); + + string s = ""; + foreach( map<string,string> db, dbList, + { + s = s + db["suffix"]:"" + " (" + db["type"]:"" + ") " + " "; + } + ); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; } @@ -63,48 +64,47 @@ // y2milestone("DBs: %1", edb); // // -// if (options["basedn"]:nil != nil && -// edb[options["basedn"]:""]:nil == nil) -// { -// db["suffix"] = options["basedn"]:""; -// } -// else -// { -// CommandLine::Print (_("No basedn provided or a database with the provided basedn does already \nexist")); -// return false; -// } -// if (options["rootdn"]:nil != nil) -// { -// db["rootdn"] = options["rootdn"]:""; -// } -// if (options["password"]:nil != nil) -// { -// db["passwd"] = options["password"]:""; -// } -// if (options["enctype"]:nil != nil) -// { -// db["cryptmethod"] = options["enctype"]:""; -// } -// if (options["dbdir"]:nil != nil) -// { -// db["directory"] = options["dbdir"]:""; -// } -// -// if(LdapServer::ReadServiceEnabled() == false) -// { -// // Database cannot be written when the service is not enabled -// LdapServer::WriteServiceEnabled(true); -// } -// + if (options["basedn"]:nil != nil ) + { + db["suffix"] = options["basedn"]:""; + } + else + { + CommandLine::Print (_("No basedn provided\n")); + return false; + } + db["type"] = options["type"]:"hdb"; + if (options["rootdn"]:nil != nil) + { + db["rootdn"] = options["rootdn"]:""; + } + if (options["password"]:nil != nil) + { + db["rootpw_clear"] = options["password"]:""; + } + db["pwenctype"] = options["enctype"]:"SSHA"; + if (options["dbdir"]:nil != nil) + { + db["directory"] = options["dbdir"]:""; + } + + if(LdapServer::ReadServiceEnabled() == false) + { + Report::Error(_("Database cannot be created when the service is not enabled")); + return false; + } + // y2milestone("db-options : %1", db); // -// ret = LdapServer::AddDatabase(db); -// -// if(!ret) -// { -// CommandLine::Print (_("Error while adding the database")); -// return false; -// } + ret = LdapServer::AddDatabase(0,db, true); + + if(!ret) + { + CommandLine::Print (_("Error while adding the database")); + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } return true; } @@ -112,87 +112,38 @@ string s = ""; integer i = 0; -// foreach(string v, LdapServer::ReadSchemaIncludeList (), -// { -// i = i + 1; -// s = s + tostring(i) + " "+ v +" "; -// }); -// -// CommandLine::Print (RichText::Rich2Plain(" "+s)); + foreach(string v, LdapServer::ReadSchemaList (), + { + if ( v != "schema" ) // skip the baseentry (hardcoded schema) + s = s + " "+ v +" "; + }); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); return false; // do not call Write... } define boolean addSchemaHandler (map options ) { - boolean ret = false; -// if (options["file"]:"" != "") -// { -// string file = options["file"]:""; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// boolean added = false; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i == pos) -// { -// rl = add(rl, file); -// added = true; -// } -// rl = add(rl, s); -// }); -// if(!added) -// { -// rl = add(rl, file); -// } -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } -// } - - return ret; -} - -define boolean delSchemaHandler (map options ) { - - boolean ret = false; -// if(options["pos"]:"" != "") -// { -// integer pos = tointeger (options["pos"]:""); -// if (pos == nil || pos < 0) -// { -// // error: wrong input (probably string or negative integer) -// Report::Error (_("The value for pos must be a positive integer.")); -// return false; -// } -// -// list<string> l = LdapServer::ReadSchemaIncludeList (); -// list<string> rl = []; -// integer i = 0; -// foreach(string s, l, -// { -// i = i + 1; -// if(i != pos) -// { -// rl = add(rl, s); -// } -// }); -// LdapServer::WriteSchemaIncludeList (rl); -// ret = true; -// } - - return ret; + if (options["file"]:"" != "") + { + string file = options["file"]:""; + if ( regexpmatch( file, ".*\.schema$" ) ) + { + if (! LdapServer::AddSchemaToSchemaList(file) ) { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + } + else if (! LdapServer::AddLdifToSchemaList(file) ) + { + map<string, string> err = LdapServer::ReadError(); + Report::Error(err["msg"]:"" + " " + err["details"]:""); + return false; + } + return true; + } + return false; } @@ -225,14 +176,14 @@ "handler" : addSchemaHandler, "help" : _("Add a schema to the list"), ], - "delSchema": $[ - "handler" : delSchemaHandler, - "help" : _("Delete a schema from the list"), - ], ], "options" : $[ "enable" : $[ "help" : _("Enable the service") ], "disable" : $[ "help" : _("Disable the service") ], + "type" : $[ + "help" : _("Database type (\"hdb\" or \"bdb\")"), + "type" : "string" + ], "basedn" : $[ "help" : _("Base DN for the database"), "type" : "string" @@ -264,11 +215,10 @@ ], "mappings" : $[ "service" :[ "enable", "disable" ], - "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir" ], + "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir", "type" ], "getDatabaseList" : [], "getSchemaList" : [], - "addSchema": [ "file", "pos" ], - "delSchema": [ "pos" ] + "addSchema": [ "file" ] ] ]; -- 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] r51736 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: rhafer Date: Wed Oct 1 14:06:27 2008 New Revision: 51736 URL: http://svn.opensuse.org/viewcvs/yast?rev=51736&view=rev Log: check result of opening schema files (bnc#431168) Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Oct 1 14:06:27 2008 @@ -1387,6 +1387,14 @@ std::string filename = arg->asString()->value_cstr(); y2milestone("adding Ldif File: %s", filename.c_str()); std::ifstream ldifFile(filename.c_str()); + if ( ! ldifFile ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } try { LdifReader ldif(ldifFile); if ( ldif.readNextRecord() ) @@ -1434,6 +1442,14 @@ y2milestone("RDN will be: %s", dn.c_str()); std::ifstream input(filename.c_str()); + if ( ! input ) + { + lastError->add( YCPString("summary"), + YCPString("Error while opening Schema file") ); + lastError->add( YCPString("description"), + YCPString("") ); + return YCPBoolean(false); + } std::string schemaLine; LDAPEntry entry(dn), oldEntry; entry.addAttribute( LDAPAttribute( "objectClass", "olcSchemaConfig" ) ); -- 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] r51735 - in /trunk/storage/storage/src/include: ep-dialogs.ycp ep-hd-dialogs.ycp ep-hd-lib.ycp
by kmachalkova＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: kmachalkova Date: Wed Oct 1 13:55:10 2008 New Revision: 51735 URL: http://svn.opensuse.org/viewcvs/yast?rev=51735&view=rev Log: Resizing the partitions, this time for real Modified: trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 1 13:55:10 2008 @@ -423,7 +423,7 @@ } //data i.e. partition - map<symbol, any> DlgResize(map <string, any> &data , map <string, any> disk, symbol flavour) + boolean DlgResize(map <string, any> &data , map <string, any> disk, symbol flavour) { integer cyl_size = disk["cyl_size"]:1; integer free_cyl_after = Storage::FreeCylAfter( disk, data); @@ -442,10 +442,9 @@ integer used = 0; integer free = 0; integer total = 0; - //leave this 5 for now, will be different for Windows integer min_free = 5; - // Unit for partition resizing - currently Megabytes + // Unit for partition resizing string unit = _("MB"); integer factor = 1024*1024; @@ -453,6 +452,23 @@ string field_label_free = ""; string field_label_vg_free = ""; + //Depending on size of the partition, + //set correct division factor and units + void AdjustUnits ( map size_data ) + { + + //for partitions with free space less than ~10GB we'll + //keep using MBs to allow fine-grained + //size adjusting + if( size_data["df_free"]:0 > 10*1024*factor ) + { + factor = factor * 1024; + unit = _("GB"); + } + + min_free = (factor==1024*1024) ? 5 : 1; + } + map AdjustSwapPartitionDf ( map size_data) { map ret = size_data; @@ -462,6 +478,11 @@ return ret; } + integer ToUI (integer i) + { + return i / factor; + } + list <string> BarGraphLabels() { string used = ""; @@ -500,20 +521,14 @@ heading = sformat(_("Resize Partition %1"), device); map size_data = Storage::GetFreeSpace( device, 0, used_fs, true); - y2internal("zirafa %1 %2", size_data["used"]:0, size_data["df_free"]:0); - - if( size_data["df_free"]:0 > 15*1024*factor ) - { - factor = factor * 1024; - unit = _("GB"); - } + AdjustUnits( size_data ); if ( Partitions::IsSwapPartition( fsid ) ) size_data = AdjustSwapPartitionDf( size_data ); - used = size_data["used"]:0 / factor; - free = size_data["df_free"]:0 / factor; - av_space = av_space / factor; + used = ToUI( size_data["used"]:0 ); + free = ToUI( size_data["df_free"]:0 ); + av_space =ToUI( av_space ); total = used + free + av_space; // TODO: see texts in inst_custom_part.ycp @@ -558,8 +573,8 @@ content, `Left(`Label( `id(`free), sformat(_("Free Space Remaining: %1 MB"), free ))), `VSpacing(1.0), - `Left(`Label( sformat(_("Minimum Partition Size: %1 MB"), used + min_free ))), - `Left(`Label( sformat(_("Maximum Partition Size: %1 MB"), total ))), + `Left(`Label( sformat(_("Minimum Partition Size: %1 %2"), used + min_free, unit ))), + `Left(`Label( sformat(_("Maximum Partition Size: %1 %2"), total, unit ))), //`PartitionSplitter(lv_used, free, vg_free, vg_min_free, lv_min_free, // bargraph_label_used, bargraph_label_free, // bargraph_label_vg_free, field_label_free, @@ -573,23 +588,47 @@ ); any widget = nil; + integer new_size = -1; + integer old_size = used + free; + do { widget = UI::UserInput(); - if (widget == `new_size) - { - integer new_size = (integer) UI::QueryWidget(`id(`new_size), `Value); - integer new_free = new_size - used ; - UI::ChangeWidget(`id(`graph), `Values, [ used, new_free, total - (new_free + used) ]); - UI::ChangeWidget(`id(`free), `Value, sformat(_("Free Space Remaining: %1 MB"), new_free)); + switch ( (symbol) widget) + { + case `new_size: + { + new_size = (integer) UI::QueryWidget(`id(`new_size), `Value); + integer new_free = new_size - used ; + UI::ChangeWidget(`id(`graph), `Values, [ used, new_free, total - (new_free + used) ]); + UI::ChangeWidget(`id(`free), `Value, sformat(_("Free Space Remaining: %1 %2"), new_free, unit)); + break; + } + case `ok: + { + if ( new_size != old_size ) + { + //mark partition for resizing + data["resize"] = true; + //calculate the difference + list old_reg = data["region"]:[]; + list new_reg = [ data["region",0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ]; + + integer diff = old_reg[1]:0 - new_reg[1]:0; + y2internal("snehulak %1", diff); + data["region"] = new_reg; + } + break; + } + case `cancel: + break; } } while ( widget != `cancel && widget != `ok); UI::CloseDialog(); - return $[ `widget : widget, - `size : 42 ]; + return ( widget == `ok); } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Oct 1 13:55:10 2008 @@ -275,8 +275,8 @@ } - void DlgResizePartition( map<string, any> data, map <string, any> disk ) + boolean DlgResizePartition( map<string, any> &data, map <string, any> disk ) { - DlgResize(data, disk, `part); + return DlgResize(data, disk, `part); } } Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 1 13:55:10 2008 @@ -260,7 +260,11 @@ } //Need to pass data on the whole disk, to determine free/available space - DlgResizePartition(data, disk); + if ( DlgResizePartition(data, disk) ) + { + target_map = Storage::SetPartition( target_map, data ); + Storage::SetTargetMap( target_map ); + } } -- 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] r51734 - /trunk/wagon/yast2-wagon.spec.in
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:50:05 2008 New Revision: 51734 URL: http://svn.opensuse.org/viewcvs/yast?rev=51734&view=rev Log: Include also *.ybc files in the final RPM Modified: trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=51… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 1 13:50:05 2008 @@ -7,7 +7,7 @@ BuildArchitectures: noarch -Summary: YaST - Product Migration Workflow +Summary: YaST2 - Product Migration Workflow %description - @@ -24,6 +24,7 @@ %defattr(-,root,root) @clientdir@/*.ycp @moduledir@/*.ycp +@moduledir@/*.ybc %dir /usr/share/YaST2/control /usr/share/YaST2/control/online_migration.xml %doc @docdir@ -- 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] r51733 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:43:04 2008 New Revision: 51733 URL: http://svn.opensuse.org/viewcvs/yast?rev=51733&view=rev Log: - Changing pattern "Documentation" to "documentation" (bnc #431218) Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Oct 1 13:43:04 2008 @@ -123,7 +123,7 @@ <system_scenarios config:type="list"> <system_scenario> <id>scenario_physical_machine</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-system</icon> </system_scenario> <system_scenario> @@ -133,7 +133,7 @@ </system_scenario> <system_scenario> <id>scenario_virtualization_host</id> - <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 Documentation</patterns> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>yast-vm-management</icon> </system_scenario> </system_scenarios> 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 Wed Oct 1 13:43:04 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:42:18 CEST 2008 - locilka(a)suse.cz + +- Changing pattern "Documentation" to "documentation" (bnc #431218) + +------------------------------------------------------------------- Tue Sep 30 13:20:09 CEST 2008 - locilka(a)suse.cz - Replacing "networkmanager" proposal call with "general" -- 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] r51732 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:37:27 2008 New Revision: 51732 URL: http://svn.opensuse.org/viewcvs/yast?rev=51732&view=rev Log: Er, grf Removed: tags/stable-2_17_0/wagon/ -- 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] r51731 - in /trunk/packager/src: clients/repositories.ycp include/repositories_include.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:35:24 2008 New Revision: 51731 URL: http://svn.opensuse.org/viewcvs/yast?rev=51731&view=rev Log: - better support for services Modified: trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 13:35:24 2008 @@ -205,6 +205,18 @@ list<map> itemList = repo_mode ? sourceStatesOut : serviceStatesOut; + // displaye only repositories from the selected service + if (repo_mode && service_name != "") + { + itemList = filter(map repo, itemList, + { + return repo["service"]:"" == service_name; + } + ); + + y2internal("table items: %1", itemList); + } + integer numItems = size(itemList); integer i = 0; @@ -296,10 +308,37 @@ } } + void clearRepoInfo() + { + if (textmode()) + { + UI::ChangeWidget(`id(`name), `Label, ""); + UI::ChangeWidget(`id(`url), `Label, ""); + UI::ChangeWidget(`id(`category), `Label, ""); + UI::ChangeWidget(`id(`service), `Label, ""); + } + else + { + UI::ChangeWidget(`id(`repo_info), `Value, ""); + } + + UI::ChangeWidget (`id (`enable), `Value, false); + UI::ChangeWidget (`id (`autorefresh), `Value, false); + + if (UI::WidgetExists(`id(`priority))) + { + // priority is displayed only for repositories + UI::ChangeWidget (`id (`priority), `Value, default_priority); + } + } + void fillCurrentRepoInfo () { integer selected = (integer)UI::QueryWidget (`id (`table), `CurrentItem); if (selected == nil) + { + clearRepoInfo(); return; + } map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[]; @@ -334,6 +373,25 @@ return ret; } + list<string> newServices (list<map<string,any> > statesOld, + list<map<string,any> > statesNew) { + y2milestone ("Services from %1 To %2", statesOld, statesNew); + list<string> ret = []; + + map<string, boolean> seen = listmap ( + map<string, any> srv, statesOld, + ``( $[(srv["alias"]:"") : (srv["enabled"]:true) ] )); + + foreach (map<string, any> srv, statesNew, { + string alias = srv["alias"]:""; + boolean newena = srv["enabled"]:true; + if (newena && ! seen[alias]:false) + ret = add (ret, alias); + }); + y2milestone ("Difference %1", ret); + return ret; + } + define void deleteSource( integer index ) ``{ integer srcid = sourceStatesOut[index, "SrcId"]:-1; @@ -398,11 +456,22 @@ } ); + // evaluate removed services +/* + foreach(integer id, servicesToDelete, + { + success = success && Pkg::ServiceDelete(id); + } + ); +*/ + success = success && KeyManager::Write(); // store in the persistent libzypp storage success = success && Pkg::SourceSaveAll(); // #176013 + success = success && Pkg::ServicesSave(); + return success; } @@ -716,66 +785,214 @@ // start the GPG key manager //RunGPGKeyMgmt(); } + else if (input == `tree) + { + // handle tree events here... + any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); + + // rebuild the dialog if needed + y2internal("Current tree item: %1", current_item); + boolean update_table_widget = false; + + if (current_item == `repositories) + { + update_table_widget = !repository_view || displayed_service != ""; + y2milestone("Switching to repository view"); + repository_view = true; + displayed_service = ""; + } + else if (current_item == `services) + { + update_table_widget = repository_view; + y2milestone("Switching to service view"); + repository_view = false; + // display all services + displayed_service = ""; + } + else if (is(current_item, string)) + { + // switch to the selected repository + y2milestone("Switching to service %1", current_item); + repository_view = true; + // display the selected service + displayed_service = (string)current_item; + + // FIXME: always update the table? + update_table_widget = true; + } + + // update table widget + if (update_table_widget) + { + ReplaceWidgets(repository_view); + } + + // update table content + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // update the current item + current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); + y2internal("UI refresh done"); + } else { current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); y2debug( "Current item: %1", current ); - map<string, any> sourceState = sourceStatesOut[ current ]:$[]; + map<string, any> sourceState = $[]; + + if (repository_view) + { + if (displayed_service == "") + { + sourceState = sourceStatesOut[ current ]:$[]; + } + else + { + if (current != nil) + { + list<map<string,any> > sources_from_service = sourceStatesOut; + + sources_from_service = filter(map<string,any> src, sources_from_service, + { + return src["service"]:"" == displayed_service; + } + ); + + sourceState = sources_from_service[current]:$[]; + } + } + } + integer id = sourceState[ "SrcId" ]:-1; - if ( id < 0 && repository_view) { + if ( id < 0 && repository_view && displayed_service == "") { y2internal("Unable to determine repository id, broken repository?"); continue; } if ( input == `replace ) { - map generalData = Pkg::SourceGeneralData( id ); - string url = generalData[ "url" ]:""; - string old_url = url; - boolean auto_refresh = sourceState["autorefresh"]:true; - boolean plaindir = generalData["type"]:"YaST" == plaindir_type; + if (repository_view) + { + map generalData = Pkg::SourceGeneralData( id ); + string url = generalData[ "url" ]:""; + string old_url = url; + boolean auto_refresh = sourceState["autorefresh"]:true; + boolean plaindir = generalData["type"]:"YaST" == plaindir_type; - SourceDialogs::SetRepoName (sourceState["name"]:""); + SourceDialogs::SetRepoName (sourceState["name"]:""); - do { - url = SourceDialogs::EditPopupType(url, plaindir); + do { + url = SourceDialogs::EditPopupType(url, plaindir); - if ( size( url ) == 0 ) break; - if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) - { - y2milestone ("URL or plaindir flag changed, recreating the source"); - // copy the refresh flag - createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); - if ( createResult == `ok ) { - deleteSource( current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - } - } - else - { - y2milestone ("URL is the same, not recreating the source"); - sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ current ] = sourceState; - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - createResult = `ok; - } + if ( size( url ) == 0 ) break; + if (url != old_url || plaindir != SourceDialogs::IsPlainDir()) + { + y2milestone ("URL or plaindir flag changed, recreating the source"); + // copy the refresh flag + createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); + if ( createResult == `ok ) { + deleteSource( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + } + } + else + { + y2milestone ("URL is the same, not recreating the source"); + sourceState["name"] = SourceDialogs::GetRepoName (); + sourceStatesOut[ current ] = sourceState; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + } + + } while ( createResult == `again ); + } + else // service view + { + map <string, any> service_info = serviceStatesOut[current]:$[]; + y2milestone("Editing service %1...", current); + string url = service_info["url"]:""; + string old_url = url; + + SourceDialogs::SetRepoName(service_info["name"]:""); + do { + url = SourceDialogs::EditPopupType(url, false); + + if ( size( url ) == 0 ) break; + if (url != old_url) + { + y2milestone ("URL of the service has been changed, recreating the service"); + // createSource() can potentially create a repository instead of a service + // Probe for a service first must be done before creating a new service + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + createResult = createSource(url, false /*plaindir*/, false /*do_refresh*/, SourceDialogs::GetRepoName()); + if ( createResult == `ok ) + { + deleteService( current ); + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + else + { + Report::Error(sformat(_("There is no service at URL: +%1"), url)); + } + } + else + { + y2milestone ("URL is the same, not recreating the service"); + string entered_service_name = SourceDialogs::GetRepoName(); - } while ( createResult == `again ); + if (service_info["name"]:nil != entered_service_name) + { + y2milestone("Updating name of the service to '%1'", entered_service_name); + service_info["name"] = entered_service_name; + serviceStatesOut[ current ] = service_info; + fillTable(repository_view, displayed_service); + fillCurrentRepoInfo(); + createResult = `ok; + + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); + } + } + + } while ( createResult == `again ); + } } else if ( input == `refresh ) { - Pkg::SourceRefreshNow (id); + if (repository_view) + { + Pkg::SourceRefreshNow (id); - if (full_mode && sourceState["enabled"]:false) + if (full_mode && sourceState["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(id, false); + Pkg::SourceSetEnabled(id, true); + } + } + else { - // force loading of the resolvables - Pkg::SourceSetEnabled(id, false); - Pkg::SourceSetEnabled(id, true); + // refresh a service + string service_name = (serviceStatesOut[current]:$[])["name"]:""; + + y2milestone("Refreshing service %1...", service_name); + Pkg::ServiceRefresh(service_name); } } else if ( input == `autorefresh_all || input == `refresh_enabled) @@ -863,7 +1080,7 @@ else { // yes-no popup - if ( Popup::YesNo( _("Delete the selected service from the list?") ) ) + if ( Popup::YesNo(sformat(_("Delete service %1?"), (serviceStatesOut[current]:$[])["name"]:""))) { deleteService( current ); fillTable(repository_view, displayed_service); @@ -975,43 +1192,6 @@ // do not refresh the item in the table current = -1; } - else if (input == `tree) - { - // handle tree events here... - any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); - - // rebuild the dialog if needed - y2internal("Current tree item: %1", current_item); - boolean update_table_widget = false; - - if (current_item == `repositories) - { - update_table_widget = !repository_view; - y2milestone("Switching to repository view"); - repository_view = true; - } - else if (current_item == `services) - { - update_table_widget = repository_view; - y2milestone("Switching to service view"); - repository_view = false; - // display all services - displayed_service = ""; - } - - // update table widget - if (update_table_widget) - { - ReplaceWidgets(repository_view); - } - - // update table content - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); - - // update the current item - current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); - } else { y2warning("Unknown user input: %1", input); Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Oct 1 13:35:24 2008 @@ -64,6 +64,29 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + string service_type = Pkg::ServiceProbe(url); + y2milestone("Probed service type: %1", service_type); + + if (service_type != nil && service_type != "NONE") + { + y2milestone("Adding a service of type %1...", service_type); + string alias = "service"; + // all current aliases + list<string> aliases = Pkg::ServiceAliases(); + + // service alias must be unique + // if it already exists add "_<number>" suffix to it + integer idx = 1; + while (contains(aliases, alias)) + { + alias = sformat("service_%1", idx); + idx = idx + 1; + } + + Pkg::ServiceAdd(alias, url); + return `ok; + } + list<list<string> > new_repos = Pkg::RepositoryScan(url); y2milestone("new_repos: %1", new_repos); -- 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] r51730 - /trunk/packager/src/modules/SourceDialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:27:28 2008 New Revision: 51730 URL: http://svn.opensuse.org/viewcvs/yast?rev=51730&view=rev Log: fixed typo (InputFiled ->InputField) Modified: trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Oct 1 13:27:28 2008 @@ -1302,7 +1302,7 @@ // text entry `InputField (`id (`server), `opt (`hstretch), _("Server &Name"), server), (type == `http || type == `https) ? - `HSquash(`InputFiled (`id (`port), _("&Port"), port)) + `HSquash(`InputField (`id (`port), _("&Port"), port)) : `Empty() ), type == `samba -- 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] r51729 - /tags/stable-2_17_0/wagon/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:19 2008 New Revision: 51729 URL: http://svn.opensuse.org/viewcvs/yast?rev=51729&view=rev Log: Created tag stable-2_17_0 for wagon Added: tags/stable-2_17_0/wagon/ - copied from r51728, trunk/wagon/ -- 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] r51728 - /trunk/wagon/package/yast2-wagon.changes
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 13:24:10 2008 New Revision: 51728 URL: http://svn.opensuse.org/viewcvs/yast?rev=51728&view=rev Log: New (the very first ever) version Modified: trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 1 13:24:10 2008 @@ -2,6 +2,7 @@ Mon Sep 29 12:44:37 CEST 2008 - locilka(a)suse.cz - Added possibility to restart YaST on request. +- 2.17.0 ------------------------------------------------------------------- Thu Sep 25 15:28:49 2008 - locilka(a)suse.cz -- 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] r51727 - in /trunk/audit-laf/src: audit-laf.ycp dialogs.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:14:14 2008 New Revision: 51727 URL: http://svn.opensuse.org/viewcvs/yast?rev=51727&view=rev Log: make command line work (remove UI:GetDisplayInfo which would initialise UI) Modified: trunk/audit-laf/src/audit-laf.ycp trunk/audit-laf/src/dialogs.ycp Modified: trunk/audit-laf/src/audit-laf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/audit-laf.ycp?rev=… ============================================================================== --- trunk/audit-laf/src/audit-laf.ycp (original) +++ trunk/audit-laf/src/audit-laf.ycp Wed Oct 1 13:14:14 2008 @@ -51,7 +51,7 @@ map cmdline_description = $[ "id" : "audit-laf", /* Command line help text for the Xaudit-laf module */ - "help" : _("Configuration of audit-laf"), + "help" : _("Configuration of Linux Audit Framework (LAF)"), "guihandler" : AuditLafSequence, "initialize" : AuditLaf::Read, "finish" : AuditLaf::Write, Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Wed Oct 1 13:14:14 2008 @@ -36,17 +36,9 @@ include "audit-laf/helps.ycp"; -map current_ui_settings = UI::GetDisplayInfo(); - integer mbox_x = 1; integer mbox_y = 0.5; -// Tabs have a different layout in textmode -if (current_ui_settings["TextMode"]:false == true) { - mbox_x = 0; - mbox_y = 0; -} - term LogfileSettingsDialogContent () { return `MarginBox( mbox_x, mbox_y, `VBox( -- 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] r51726 - /trunk/audit-laf/src/complex.ycp
by gs＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: gs Date: Wed Oct 1 13:12:06 2008 New Revision: 51726 URL: http://svn.opensuse.org/viewcvs/yast?rev=51726&view=rev Log: remove superfluous sformat Modified: trunk/audit-laf/src/complex.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=51… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Wed Oct 1 13:12:06 2008 @@ -363,7 +363,7 @@ map output = (map)SCR::Execute(.target.bash_output, sformat( "auditctl -R %1", tmpfile ) ); if ( output["exit"]:0 != 0 ) { - Report::Error( sformat( output["stderr"]:"" ) ); + Report::Error( output["stderr"]:"" ); } else { @@ -416,8 +416,7 @@ This means the rules are locked until next boot! If you really want this, make sure '-e 2' is the last entry in the rules file. If not, either enable or disable auditing. -To check or to change the rules, -please go back to rules editor."), +To check or to change the rules, please go back to rules editor."), Label::ContinueButton(), Label::BackButton(), `focus_no ); -- 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] r51725 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/ServiceManager.cc src/ServiceManager.h
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 13:08:40 2008 New Revision: 51725 URL: http://svn.opensuse.org/viewcvs/yast?rev=51725&view=rev Log: - fixed Pkg::ServiceRefresh() - search for the service URL and pass it to libzypp Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/ServiceManager.cc trunk/pkg-bindings/src/ServiceManager.h 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 Wed Oct 1 13:08:40 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 13:02:00 CEST 2008 - lslezak(a)suse.cz + +- fixed Pkg::ServiceRefresh() - search for the service URL and pass + it to libzypp + +------------------------------------------------------------------- Mon Sep 29 14:27:21 CEST 2008 - lslezak(a)suse.cz - do not autorefresh remote repositories when there is no network Modified: trunk/pkg-bindings/src/ServiceManager.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.cc (original) +++ trunk/pkg-bindings/src/ServiceManager.cc Wed Oct 1 13:08:40 2008 @@ -114,11 +114,19 @@ return ret; } -bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const +bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) { try { - repomgr.refreshService(alias); + PkgServices::iterator serv_it = _known_services.find(alias); + + if (serv_it == _known_services.end()) + { + y2error("Service '%s' does not exist", alias.c_str()); + return false; + } + + repomgr.refreshService(serv_it->second); return true; } catch(...) Modified: trunk/pkg-bindings/src/ServiceManager.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.h (original) +++ trunk/pkg-bindings/src/ServiceManager.h Wed Oct 1 13:08:40 2008 @@ -52,7 +52,7 @@ bool SetService(const std::string old_alias, const zypp::ServiceInfo &srv); - bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr) const; + bool RefreshService(const std::string &alias, zypp::RepoManager &repomgr); std::string Probe(const zypp::Url &url, const zypp::RepoManager &repomgr) const; -- 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] r51724 - /tags/stable-2_17_5/add-on/
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 12:05:52 2008 New Revision: 51724 URL: http://svn.opensuse.org/viewcvs/yast?rev=51724&view=rev Log: Created tag stable-2_17_5 for add-on Added: tags/stable-2_17_5/add-on/ - copied from r51723, trunk/add-on/ -- 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] r51723 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.desktop src/add-on.ycp src/inst_language_add-on.ycp src/vendor.ycp
by locilka＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: locilka Date: Wed Oct 1 11:58:37 2008 New Revision: 51723 URL: http://svn.opensuse.org/viewcvs/yast?rev=51723&view=rev Log: - Changed texts (bnc #431177). - 2.17.5 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.desktop trunk/add-on/src/add-on.ycp trunk/add-on/src/inst_language_add-on.ycp trunk/add-on/src/vendor.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=51723&r1=5172… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Wed Oct 1 11:58:37 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Oct 1 11:58:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 11:57:38 CEST 2008 - locilka(a)suse.cz + +- Changed texts (bnc #431177). +- 2.17.5 + +------------------------------------------------------------------- Tue Sep 30 10:53:19 CEST 2008 - locilka(a)suse.cz - Support for commandline: "help", "longhelp", and "xmlhelp" Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Wed Oct 1 11:58:37 2008 @@ -847,7 +847,7 @@ if (! enable_back) Wizard::DisableBackButton(); if (! enable_next) Wizard::DisableNextButton(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); // disable delete button if no items listed // bug #203809 @@ -980,7 +980,7 @@ // Use new wizard window for adding new Add-On. // Do not use "Steps" dialog. Wizard::OpenNextBackDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); symbol ret = RunWizard (); Wizard::CloseDialog(); @@ -1055,7 +1055,7 @@ `PushButton (`id (`delete), Label::DeleteButton()), `HStretch(), // TRANSLATORS: push button - `PushButton (`id (`packager), _("Run &Package Manager...")) + `PushButton (`id (`packager), _("Run &Software Manager...")) ) ), // TRANSLATORS: dialog help adp/1 Modified: trunk/add-on/src/add-on.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.desktop?rev=51… ============================================================================== --- trunk/add-on/src/add-on.desktop (original) +++ trunk/add-on/src/add-on.desktop Wed Oct 1 11:58:37 2008 @@ -21,7 +21,7 @@ Icon=yast-addon Exec=/sbin/yast2 add-on -Name=Add-On Product -GenericName=Install an Add-On Product +Name=Add-On Products +GenericName=Install or remove add-on products X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=51723&… ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Wed Oct 1 11:58:37 2008 @@ -90,7 +90,7 @@ false ); -Wizard::SetDesktopIcon("vendor"); +Wizard::SetTitleIcon("vendor"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); Modified: trunk/add-on/src/inst_language_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_language_add-on.… ============================================================================== --- trunk/add-on/src/inst_language_add-on.ycp (original) +++ trunk/add-on/src/inst_language_add-on.ycp Wed Oct 1 11:58:37 2008 @@ -119,7 +119,7 @@ Label::BackButton(), Label::NextButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::DisableAbortButton(); Wizard::DisableNextButton(); @@ -178,7 +178,7 @@ Label::BackButton(), Label::OKButton() ); - Wizard::SetDesktopIcon("yast-language"); + Wizard::SetTitleIcon("yast-language"); Wizard::DisableBackButton(); Wizard::EnableAbortButton(); Wizard::EnableNextButton(); Modified: trunk/add-on/src/vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/vendor.ycp?rev=51723&… ============================================================================== --- trunk/add-on/src/vendor.ycp (original) +++ trunk/add-on/src/vendor.ycp Wed Oct 1 11:58:37 2008 @@ -85,7 +85,7 @@ any result = nil; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("vendor"); + Wizard::SetTitleIcon("vendor"); Wizard::HideAbortButton(); // VENDOR: main screen heading -- 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] r51722 - in /trunk/fingerprint-reader: agent-fprint/src/FPrintAgent.cc package/yast2-fingerprint-reader.changes
by jsuchome＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: jsuchome Date: Wed Oct 1 11:57:57 2008 New Revision: 51722 URL: http://svn.opensuse.org/viewcvs/yast?rev=51722&view=rev Log: - call _exit() to exit the child process, not exit() (bnc#430229) - reduced some debugging code Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/… ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Wed Oct 1 11:57:57 2008 @@ -44,20 +44,18 @@ void FPrintAPI::catch_sigterm (int sig_num) { instance().finalize (); - exit (256); + _exit (256); } // de-initialize finger print reader (must be called at the end!) void FPrintAPI::finalize () { - y2internal ("finalize"); if (instance().data != NULL) { fp_print_data_free (instance().data); instance().data = NULL; } fp_exit(); - y2internal ("finalized"); } FPrintAPI::FPrintAPI() @@ -133,20 +131,18 @@ do { sleep (1); - y2internal ("Scan your finger now."); - - // FIXME not possible, this is total number of stages - y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev)); r = fp_enroll_finger (dev, &enrolled_print); + y2debug ("retval: %d", r); + if (r < 0) { y2error ("Enroll failed with error %d", r); instance().finalize (); signal (15, SIG_DFL); return r; } -y2internal ("retval: %d", r); + if (write (write_fd, &r, sizeof (int)) == -1) y2error ("write to pipe failed: %d (%m)", errno); @@ -411,7 +407,7 @@ FPrintAPI::instance().acquire (data_pipe[1], path); y2milestone ("acquire done with state %d", state); close (data_pipe[1]); - exit (state); + _exit (state); } else // parent -> return { Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Wed Oct 1 11:57:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 11:53:49 CEST 2008 - jsuchome(a)suse.cz + +- call _exit() to exit the child process, not exit() (bnc#430229) + +------------------------------------------------------------------- Mon Sep 29 15:51:23 CEST 2008 - jsuchome(a)suse.cz - check the values returned by agent (fp_enroll_finger_img) in YCP -- 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] r51721 - /branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: juhliarik Date: Wed Oct 1 10:06:34 2008 New Revision: 51721 URL: http://svn.opensuse.org/viewcvs/yast?rev=51721&view=rev Log: added commnet about changes Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Wed Oct 1 10:06:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 10:05:20 CEST 2008 - juhliarik(a)suse.cz + +- added fix for cloning sections (bnc #429525) + +------------------------------------------------------------------- Thu Sep 16 16:30:19 CEST 2008 - juhliarik(a)suse.cz - added fix for obtaining name of default section (bnc #364904) -- 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] r51720 - /branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp
by juhliarik＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: juhliarik Date: Wed Oct 1 10:05:06 2008 New Revision: 51720 URL: http://svn.opensuse.org/viewcvs/yast?rev=51720&view=rev Log: added fix for cloning sections bnc #429525 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/generic/section_type_widget.ycp Wed Oct 1 10:05:06 2008 @@ -66,8 +66,9 @@ else { BootCommon::current_section["name"] = ""; - BootCommon::current_section["original_name"] = ""; + // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; + BootCommon::current_section["lines_cache_id"] = ""; } return nil; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0