February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45035 - in /branches/SuSE-SLE-10-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_system_analysis.ycp
by locilka＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: locilka Date: Tue Feb 26 17:13:17 2008 New Revision: 45035 URL: http://svn.opensuse.org/viewcvs/yast?rev=45035&view=rev Log: - Catching an exception when calling the inst_repair fails and reporting the error message containing suggestions what to do (bnc #359719). - 2.13.205 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_system_analysis.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/VERSION Tue Feb 26 17:13:17 2008 @@ -1 +1 @@ -2.13.204 +2.13.205 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Tue Feb 26 17:13:17 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Feb 26 17:08:19 CET 2008 - locilka(a)suse.cz + +- Catching an exception when calling the inst_repair fails and + reporting the error message containing suggestions what to do + (bnc #359719). +- 2.13.205 + +------------------------------------------------------------------- Fri Feb 22 11:31:15 CET 2008 - locilka(a)suse.cz - "iscsi-client" added into modules to clone (bnc #363229 c#1). Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/clients/inst_system_analysis.ycp Tue Feb 26 17:13:17 2008 @@ -427,7 +427,24 @@ if (Mode::repair ()) { y2milestone("Calling inst_repair"); - WFM::CallFunction ("inst_repair"); + any repair_ret = WFM::CallFunction ("inst_repair"); + + // bnc #359719 + // something went wrong with repair + if (repair_ret == nil) { + Popup::ModuleError (sformat ( + _("Calling the YaST module %1 has failed. +More information can be found near the end of the '%2' file. + +This is worth reporting a bug at %3. +Please, attach also all YaST logs stored in the '%4' directory."), + "inst_repair", + "/var/log/YaST2/y2log", + "http://bugzilla.novell.com/", + "/var/log/YaST2/" + )); + } + return `finish; } -- 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] r45034 - /trunk/gtk/src/YGLayout.cc
by rpmcruz＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: rpmcruz Date: Tue Feb 26 16:53:23 2008 New Revision: 45034 URL: http://svn.opensuse.org/viewcvs/yast?rev=45034&view=rev Log: Revert layout tweak. Modified: trunk/gtk/src/YGLayout.cc Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=45034&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Tue Feb 26 16:53:23 2008 @@ -86,8 +86,8 @@ YGLabeledWidget *labeledWidget = dynamic_cast <YGLabeledWidget *> (YGWidget::get (yLabeledWidget)); if (labeledWidget && labeledWidget->orientation() == YD_HORIZ) { - horiz_fill = yLabeledWidget->stretchable (YD_HORIZ) || yLabeledWidget->hasWeight (YD_HORIZ); - if (horiz_fill) +/* horiz_fill = yLabeledWidget->stretchable (YD_HORIZ) || yLabeledWidget->hasWeight (YD_HORIZ); + if (horiz_fill)*/ addSizeGroup (labeledWidget); } } -- 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] r45033 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGFrame.cc src/YGLayout.cc src/YGUI.cc src/YGUI.h
by rpmcruz＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: rpmcruz Date: Tue Feb 26 16:42:08 2008 New Revision: 45033 URL: http://svn.opensuse.org/viewcvs/yast?rev=45033&view=rev Log: * src/YGLayout.cc: removed label alignment tweak for non-stretchable widgets. * src/YGUI.h/cc: sync with libyui changes: moved some methods from YUI to YApplication. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGFrame.cc trunk/gtk/src/YGLayout.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=45033&r1=45032… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Feb 26 16:42:08 2008 @@ -10,6 +10,10 @@ * src/YGIntField.cc (YSlider): don't draw values (that's what the side int field is for). + * src/YGLayout.cc: removed label alignment tweak for non-stretchable widgets. + + * src/YGUI.h/cc: sync with libyui changes: moved some methods from YUI to YApplication. + 2008-02-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (DiskView): fixed #363473 and enabled as a Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=45033&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Tue Feb 26 16:42:08 2008 @@ -195,7 +195,7 @@ y2milestone ("Caught YaST2 magic key combination"); switch (event->keyval) { case GDK_S: - YGUI::ui()->makeScreenShot(""); + YGUI::ui()->makeScreenShot(); return TRUE; case GDK_M: YGUI::ui()->toggleRecordMacro(); @@ -409,8 +409,8 @@ } YEvent *YGDialog::waitForEventInternal (int timeout_millisec) -{ return YGUI::ui()->userInput (timeout_millisec); } +{ return YGUI::ui()->waitInput (timeout_millisec, true); } YEvent *YGDialog::pollEventInternal() -{ return YGUI::ui()->pollInput(); } +{ return YGUI::ui()->waitInput (0, false); } Modified: trunk/gtk/src/YGFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGFrame.cc?rev=45033&r1=… ============================================================================== --- trunk/gtk/src/YGFrame.cc (original) +++ trunk/gtk/src/YGFrame.cc Tue Feb 26 16:42:08 2008 @@ -59,6 +59,10 @@ YFrame::setLabel (str); } + // Debug + virtual string getDebugLabel() const + { return label(); } + YGWIDGET_IMPL_COMMON YGWIDGET_IMPL_CHILD_ADDED (m_containee) YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=45033&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Tue Feb 26 16:42:08 2008 @@ -71,7 +71,7 @@ // align horizontal widget labels to the same width // we do some work here, since they may be placed inside a HBox or something... - if (!horiz_fill) + if (dim == YD_HORIZ && !horiz_fill) return; YWidget *yLabeledWidget = ychild; while (yLabeledWidget->hasChildren()) { // container @@ -85,8 +85,11 @@ } YGLabeledWidget *labeledWidget = dynamic_cast <YGLabeledWidget *> (YGWidget::get (yLabeledWidget)); - if (labeledWidget && labeledWidget->orientation() == YD_HORIZ) - addSizeGroup (labeledWidget); + if (labeledWidget && labeledWidget->orientation() == YD_HORIZ) { + horiz_fill = yLabeledWidget->stretchable (YD_HORIZ) || yLabeledWidget->hasWeight (YD_HORIZ); + if (horiz_fill) + addSizeGroup (labeledWidget); + } } }; Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=45033&r1=450… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Tue Feb 26 16:42:08 2008 @@ -18,6 +18,14 @@ static std::string askForFileOrDirectory (GtkFileChooserAction action, const std::string &path, const std::string &filter, const std::string &title); +static void errorMsg (const char *msg) +{ + GtkWidget* dialog = gtk_message_dialog_new (NULL, + GtkDialogFlags (0), GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + #define DEFAULT_MACRO_FILE_NAME "macro.ycp" #define BUSY_CURSOR_TIMEOUT 250 //#define PRINT_EVENTS @@ -203,47 +211,12 @@ return event; } -YEvent *YGUI::userInput (unsigned long timeout_ms) -{ return waitInput (timeout_ms, true); } - -YEvent *YGUI::pollInput() -{ return waitInput (0, false); } - void YGUI::sendEvent (YEvent *event) { m_event_handler.sendEvent (event); g_main_context_wakeup (NULL); } -// YWidget layout units -> pixels conversion. Same as yast-qt's. -int YGUI::deviceUnits (YUIDimension dim, float size) -{ - if (dim == YD_HORIZ) return (long) ((size * (640.0/80)) + 0.5); - else return (long) ((size * (480.0/25)) + 0.5); -} - -float YGUI::layoutUnits (YUIDimension dim, int device_units) -{ - float size = (float) device_units; - if (dim == YD_HORIZ) return size * (80/640.0); - else return size * (25/480.0); -} - -static void errorMsg (const char *msg) -{ - GtkWidget* dialog = gtk_message_dialog_new - (NULL, GtkDialogFlags (0), GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, "%s", msg); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -void YGUI::internalError (const char *msg) -{ - errorMsg (msg); - abort(); // going down -} - gboolean YGUI::busy_timeout_cb (gpointer data) { YGUI *pThis = (YGUI *) data; @@ -271,7 +244,10 @@ dialog->normalCursor(); } -YEvent* YGUI::runPkgSelection (YWidget *packageSelector) +void YGUI::makeScreenShot() +{ ((YGApplication *) app())->makeScreenShot (""); } + +YEvent *YGUI::runPkgSelection (YWidget *packageSelector) { y2milestone( "Running package selection..." ); YEvent *event = 0; @@ -288,7 +264,67 @@ return event; } -void YGUI::makeScreenShot (string filename) +void YGUI::askPlayMacro() +{ + string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_OPEN, + DEFAULT_MACRO_FILE_NAME, "*.ycp", "Select Macro File to Play"); + if (!filename.empty()) { + busyCursor(); + YMacro::play (filename); + sendEvent (new YEvent()); // flush + } +} + +void YGUI::toggleRecordMacro() +{ + if (YMacro::recording()) { + YMacro::endRecording(); + normalCursor(); + + GtkWidget* dialog = gtk_message_dialog_new (NULL, + GtkDialogFlags (0), GTK_MESSAGE_INFO, GTK_BUTTONS_OK, + "Macro recording done."); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } + else { + string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, + DEFAULT_MACRO_FILE_NAME, "*.ycp", "Select Macro File to Record to"); + if (!filename.empty()) + YMacro::record (filename); + } +} + +void YGUI::askSaveLogs() +{ + string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, + "/tmp/y2logs.tgz", "*.tgz *.tar.gz", "Save y2logs to..."); + if (!filename.empty()) { + std::string command = "/sbin/save_y2logs"; + command += " '" + filename + "'"; + y2milestone ("Saving y2logs: %s", command.c_str()); + int ret = system (command.c_str()); + if (ret == 0) + y2milestone ("y2logs saved to %s", filename.c_str()); + else { + char *error = g_strdup_printf ( + "Error: couldn't save y2logs: \"%s\" (exit value: %d)", + command.c_str(), ret); + y2error (error); + errorMsg (error); + g_free (error); + } + } +} + +//** YGApplication + +YGApplication::YGApplication() +{ + setIconBasePath (ICON_DIR); +} + +void YGApplication::makeScreenShot (string filename) { IMPL bool interactive = filename.empty(); @@ -374,7 +410,7 @@ g_object_unref (G_OBJECT (shot)); } -void YGUI::beep() +void YGApplication::beep() { gdk_beep(); GtkWindow *window = YGDialog::currentWindow(); @@ -382,67 +418,7 @@ gtk_window_present (window); } -void YGUI::toggleRecordMacro() -{ - if (YMacro::recording()) { - YMacro::endRecording(); - normalCursor(); - - GtkWidget* dialog = gtk_message_dialog_new (NULL, - GtkDialogFlags (0), GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - "Macro recording done."); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - else { - string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - DEFAULT_MACRO_FILE_NAME, "*.ycp", "Select Macro File to Record to"); - if (!filename.empty()) - YMacro::record (filename); - } -} - -void YGUI::askPlayMacro() -{ - string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_OPEN, - DEFAULT_MACRO_FILE_NAME, "*.ycp", "Select Macro File to Play"); - if (!filename.empty()) { - busyCursor(); - YMacro::play (filename); - sendEvent (new YEvent()); // flush - } -} - -void YGUI::askSaveLogs() -{ - string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - "/tmp/y2logs.tgz", "*.tgz *.tar.gz", "Save y2logs to..."); - if (!filename.empty()) { - std::string command = "/sbin/save_y2logs"; - command += " '" + filename + "'"; - y2milestone ("Saving y2logs: %s", command.c_str()); - int ret = system (command.c_str()); - if (ret == 0) - y2milestone ("y2logs saved to %s", filename.c_str()); - else { - char *error = g_strdup_printf ( - "Error: couldn't save y2logs: \"%s\" (exit value: %d)", - command.c_str(), ret); - y2error (error); - errorMsg (error); - g_free (error); - } - } -} - -//** YGApplication - -YGApplication::YGApplication() -{ - setIconBasePath (ICON_DIR); -} - -/* File/directory dialogs. */ +// File/directory dialogs #include <sstream> std::string askForFileOrDirectory (GtkFileChooserAction action, @@ -547,6 +523,23 @@ return ""; } +// YWidget layout units -> pixels conversion. Same as yast-qt's. +int YGApplication::deviceUnits (YUIDimension dim, float size) +{ + if (dim == YD_HORIZ) + size *= 640.0 / 80; + else + size *= 480.0 / 25; + return size + 0.5; +} + +float YGApplication::layoutUnits (YUIDimension dim, int units) +{ + float size = (float) units; + if (dim == YD_HORIZ) return size * (80/640.0); + else return size * (25/480.0); +} + int YGApplication::displayWidth() { return getDisplayWidth(); } Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=45033&r1=4503… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Tue Feb 26 16:42:08 2008 @@ -52,29 +52,21 @@ virtual YApplication *createApplication(); public: - YEvent *waitInput (unsigned long timeout_ms, bool block); virtual void idleLoop (int fd_ycp); - // these two are now implemented at YDialog... - YEvent *userInput (unsigned long timeout_millisec); - YEvent *pollInput(); - - virtual void internalError (const char *msg); - - virtual int deviceUnits (YUIDimension dim, float layout_units); - virtual float layoutUnits (YUIDimension dim, int device_units); - - virtual void busyCursor(); - virtual void normalCursor(); + // called by YDialog::waitInput() / pollEvent()... + YEvent *waitInput (unsigned long timeout_ms, bool block); - virtual void makeScreenShot (string filename); - virtual void beep(); virtual YEvent * runPkgSelection (YWidget *packageSelector); - void toggleRecordMacro(); + // used internally: for public use, see YApplication + void busyCursor(); + void normalCursor(); + void makeScreenShot(); // Plays a macro, opening a dialog first to ask for the filename // activated by Ctrl-Shift-Alt-P void askPlayMacro(); + void toggleRecordMacro(); // On Shift-F8, run save_logs void askSaveLogs(); @@ -94,10 +86,6 @@ bool m_have_wm, m_no_border, m_fullscreen; GtkRequisition m_default_size; - // for screenshots: - std::map <std::string, int> screenShotNb; - std::string screenShotNameTemplate; - public: // Helpers for internal use [ visibility hidden ] int _getDefaultWidth(); int _getDefaultHeight(); @@ -219,6 +207,15 @@ virtual std::string askForSaveFileName (const std::string &startWith, const std::string &filter, const std::string &headline); + virtual void busyCursor() { YGUI::ui()->busyCursor(); } + virtual void normalCursor() { YGUI::ui()->normalCursor(); } + + virtual void makeScreenShot (string filename); + virtual void beep(); + + virtual int deviceUnits (YUIDimension dim, float layout_units); + virtual float layoutUnits (YUIDimension dim, int device_units); + virtual int displayWidth(); virtual int displayHeight(); virtual int displayDepth(); @@ -235,6 +232,10 @@ virtual bool hasFullUtf8Support() IMPL_RET (true) virtual bool richTextSupportsTable() IMPL_RET (false) +private: + // for screenshots: + std::map <std::string, int> screenShotNb; + std::string screenShotNameTemplate; }; #endif /*YGUI_H*/ -- 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] r45032 - /tags/stable-2_16_4/http-server/
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 16:11:34 2008 New Revision: 45032 URL: http://svn.opensuse.org/viewcvs/yast?rev=45032&view=rev Log: Created tag stable-2_16_4 for http-server Added: tags/stable-2_16_4/http-server/ - copied from r45031, trunk/http-server/ -- 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] r45031 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServer.ycp
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 16:11:19 2008 New Revision: 45031 URL: http://svn.opensuse.org/viewcvs/yast?rev=45031&view=rev Log: check if network is running Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServer.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=45031&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue Feb 26 16:11:19 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue Feb 26 16:11:19 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 26 16:10:23 CET 2008 - mzugec(a)suse.de + +- check if network is running +- 2.16.4 + +------------------------------------------------------------------- Thu Feb 21 17:43:53 CET 2008 - mzugec(a)suse.de - text proofread Modified: trunk/http-server/src/HttpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServer.ycp?r… ============================================================================== --- trunk/http-server/src/HttpServer.ycp (original) +++ trunk/http-server/src/HttpServer.ycp Tue Feb 26 16:11:19 2008 @@ -120,6 +120,7 @@ // check the environment if(!Confirm::MustBeRoot()) return false; + if(!NetworkService::RunningNetworkPopup()) return false; if (!NetworkService::ConfirmNetworkManager()) return false; Progress::NextStep(); -- 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] r45030 - in /branches/SuSE-SLE-10-SP2-Branch/storage: package/yast2-storage.changes storage/src/include/do_proposal_flexible.ycp
by fehr＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: fehr Date: Tue Feb 26 16:08:02 2008 New Revision: 45030 URL: http://svn.opensuse.org/viewcvs/yast?rev=45030&view=rev Log: fix problem when reusing existing partition (#267212) Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Tue Feb 26 16:08:02 2008 @@ -2,6 +2,7 @@ Tue Feb 26 13:14:01 CET 2008 - fehr(a)suse.de - allow setting of mountBy to `device (bnc#364793) +- fix problem when reusing existing partition (#267212) - version 2.13.100 ------------------------------------------------------------------- Modified: branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp Tue Feb 26 16:08:02 2008 @@ -1199,11 +1199,15 @@ addl = add( addl, llg["ext_pnr",0]:5 ); llg["ext_pnr"] = remove( llg["ext_pnr"]:[0], 0 ); } - else + else if( !e["exists"]:false ) { addl = add( addl, llg["free_pnr",0]:1 ); llg["free_pnr"] = remove( llg["free_pnr"]:[0], 0 ); } + else + { + addl = add( addl, e["nr"]:0 ); + } llg["gap",gindex,"added"] = add( llg["gap",gindex,"added"]:[], addl ); if( pindex+1 < size(ps) ) @@ -2774,6 +2778,8 @@ disk["partitions"] = p; map r = can_swap_reuse( s, disk["partitions"]:[], target ); boolean have_swap = size(r)>0; + y2milestone( "get_inst_proposal have_boot %1 have_swap %2", + have_boot, have_swap ); if( haskey( r, "partitions" )) disk["partitions"] = r["partitions"]:[]; else if( haskey( r, "targets" )) -- 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] r45029 - /tags/stable-2_16_0/slp-server/
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 16:03:00 2008 New Revision: 45029 URL: http://svn.opensuse.org/viewcvs/yast?rev=45029&view=rev Log: Created tag stable-2_16_0 for slp-server Added: tags/stable-2_16_0/slp-server/ - copied from r45028, trunk/slp-server/ -- 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] r45028 - in /trunk/slp-server: VERSION package/yast2-slp-server.changes src/SlpServer.ycp
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 16:02:32 2008 New Revision: 45028 URL: http://svn.opensuse.org/viewcvs/yast?rev=45028&view=rev Log: check if network is running Modified: trunk/slp-server/VERSION trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/SlpServer.ycp Modified: trunk/slp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/VERSION?rev=45028&r1=… ============================================================================== --- trunk/slp-server/VERSION (original) +++ trunk/slp-server/VERSION Tue Feb 26 16:02:32 2008 @@ -1 +1 @@ -2.15.0 +2.16.0 Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-ser… ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Tue Feb 26 16:02:32 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 26 16:01:52 CET 2008 - mzugec(a)suse.de + +- check if network is running +- 2.16.0 + +------------------------------------------------------------------- Mon Jul 16 12:53:16 CEST 2007 - mzugec(a)suse.cz - don't disable Scopes for "Becomes DA Server" option (#291307) Modified: trunk/slp-server/src/SlpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/SlpServer.ycp?rev… ============================================================================== --- trunk/slp-server/src/SlpServer.ycp (original) +++ trunk/slp-server/src/SlpServer.ycp Tue Feb 26 16:02:32 2008 @@ -26,6 +26,7 @@ import "Popup"; import "Confirm"; import "Map"; +import "NetworkService"; include "slp-server/helps.ycp"; @@ -209,6 +210,8 @@ // check if user is root if(!Confirm::MustBeRoot()) return false; + if(!NetworkService::RunningNetworkPopup()) return false; + Progress::NextStage(); if(false) return false; 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] r45027 - /tags/stable-2_16_0/iscsi-server/
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 15:54:05 2008 New Revision: 45027 URL: http://svn.opensuse.org/viewcvs/yast?rev=45027&view=rev Log: Created tag stable-2_16_0 for iscsi-server Added: tags/stable-2_16_0/iscsi-server/ - copied from r45026, trunk/iscsi-server/ -- 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] r45026 - in /trunk/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServer.ycp
by mzugec＠svn.opensuse.org 26 Feb '08

26 Feb '08

Author: mzugec Date: Tue Feb 26 15:53:51 2008 New Revision: 45026 URL: http://svn.opensuse.org/viewcvs/yast?rev=45026&view=rev Log: check if network is running Modified: trunk/iscsi-server/VERSION trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/IscsiServer.ycp Modified: trunk/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/VERSION?rev=45026&r… ============================================================================== --- trunk/iscsi-server/VERSION (original) +++ trunk/iscsi-server/VERSION Tue Feb 26 15:53:51 2008 @@ -1 +1 @@ -2.14.4 +2.16.0 Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Tue Feb 26 15:53:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 24 15:55:37 CET 2008 - mzugec(a)suse.de + +- check if network is running +- 2.16.0 + +------------------------------------------------------------------- Thu Jan 10 19:19:10 CET 2008 - mzugec(a)suse.cz - added iSNS support (FaTE #302083) Modified: trunk/iscsi-server/src/IscsiServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/IscsiServer.ycp… ============================================================================== --- trunk/iscsi-server/src/IscsiServer.ycp (original) +++ trunk/iscsi-server/src/IscsiServer.ycp Tue Feb 26 15:53:51 2008 @@ -26,6 +26,7 @@ import "Confirm"; import "IscsiServerFunctions"; import "Mode"; +import "NetworkService"; boolean serviceStatus = false; boolean statusOnStart = false; @@ -279,6 +280,7 @@ // check if user is root if(!Confirm::MustBeRoot()) return false; + if(!NetworkService::RunningNetworkPopup()) return false; Progress::NextStage(); // check if required packages ("iscsitarget") are installed if(!installed_packages()) return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0