April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57039 - /trunk/gtk/src/YGText.cc
by rpmcruz＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: rpmcruz Date: Wed Apr 29 20:48:47 2009 New Revision: 57039 URL: http://svn.opensuse.org/viewcvs/yast?rev=57039&view=rev Log: Regress 459657. Modified: trunk/gtk/src/YGText.cc Modified: trunk/gtk/src/YGText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGText.cc?rev=57039&r1=5… ============================================================================== --- trunk/gtk/src/YGText.cc (original) +++ trunk/gtk/src/YGText.cc Wed Apr 29 20:48:47 2009 @@ -120,11 +120,6 @@ return 30; } - virtual void doSetEnabled (bool enabled) - { - gtk_text_view_set_editable(GTK_TEXT_VIEW (getWidget()), enabled); - } - YGLABEL_WIDGET_IMPL (YMultiLineEdit) }; -- 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] r57038 - /tags/stable-2_18_7/packager/
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 17:50:56 2009 New Revision: 57038 URL: http://svn.opensuse.org/viewcvs/yast?rev=57038&view=rev Log: Created tag stable-2_18_7 for packager Added: tags/stable-2_18_7/packager/ - copied from r57037, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57037 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 17:48:41 2009 New Revision: 57037 URL: http://svn.opensuse.org/viewcvs/yast?rev=57037&view=rev Log: - 2.18.7 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=57037&r1=57… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Apr 29 17:48:41 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 29 17:48:41 2009 @@ -8,6 +8,7 @@ - open create repository dialog in a new window, fixes broken UI caused by the previous fix (bnc#269034) - confirm adding of an already known repository (URL) (bnc#471054) +- 2.18.7 ------------------------------------------------------------------- Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz 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 Apr 29 17:48:41 2009 @@ -1533,7 +1533,7 @@ ) ) { - // add URL again + // ask again ret = nil; } } -- 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] r57036 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 17:20:09 2009 New Revision: 57036 URL: http://svn.opensuse.org/viewcvs/yast?rev=57036&view=rev Log: - confirm adding of an already known repository (URL) (bnc#471054) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 29 17:20:09 2009 @@ -7,6 +7,7 @@ - preserve repository priority when changing URL - open create repository dialog in a new window, fixes broken UI caused by the previous fix (bnc#269034) +- confirm adding of an already known repository (URL) (bnc#471054) ------------------------------------------------------------------- Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz 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 Apr 29 17:20:09 2009 @@ -455,7 +455,7 @@ } ); - y2milestone("New service config: %1", sourceStatesOut); + y2milestone("New service config: %1", serviceStatesOut); foreach(map<string,any> s, serviceStatesOut, { string alias = s["alias"]:""; @@ -1034,6 +1034,8 @@ // replace the data sourceStatesOut[global_current] = addedSource; + // remove the duplicate at the end + sourceStatesOut = remove(sourceStatesOut, idx); // refresh only the name and URL in the table UI::ChangeWidget(`id(`table), `Cell( global_current, 3), addedSource["name"]:""); @@ -1473,10 +1475,72 @@ return ret; } +boolean KnownURL(string url) +{ + string scheme = tolower(URL::Parse(url)["scheme"]:""); + + // alway create CD/DVD repository + if (scheme == "cd" || scheme == "dvd") + { + return false; + } + + boolean ret = false; + + foreach (map<string,any> src, sourceStatesOut, + { + integer src_id = tointeger(src["SrcId"]:nil); + map generalData = Pkg::SourceGeneralData(src_id); + string src_url = generalData["url"]:""; + + if (src_url == url) + { + ret = true; + } + } + ); + + y2milestone("URL exists: %1", ret); + + return ret; +} + symbol StartEditDialog() { y2milestone("Edit URL with protocol %1", selected_url_scheme); - symbol ret = SourceDialogs::EditDialogProtocol(selected_url_scheme); + symbol ret = nil; + + do + { + ret = SourceDialogs::EditDialogProtocol(selected_url_scheme); + + if (ret == `next) + { + string url = SourceDialogs::GetURL(); + boolean known_url = KnownURL(url); + + if (known_url) + { + // popup question, %1 is repository URL + if (!Popup::AnyQuestion("", + sformat(_("Repository %1 +has been already added. Each repository should be added only once. + +Really add the repository again?"), URL::HidePassword(url)), + Label::YesButton(), + Label::NoButton(), + `focus_no + ) + ) + { + // add URL again + ret = nil; + } + } + } + } + while (ret == nil); + y2milestone("Result: %1", ret); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57035 - /branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp
by kmachalkova＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: kmachalkova Date: Wed Apr 29 15:54:30 2009 New Revision: 57035 URL: http://svn.opensuse.org/viewcvs/yast?rev=57035&view=rev Log: slightly moved search field Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Wed Apr 29 15:54:30 2009 @@ -57,22 +57,6 @@ { qDebug(); - // Tool bar - QToolBar *toolbar = new QToolBar(this); - - // Search Widget - QWidget *searchWidget = new QWidget(this); - QHBoxLayout *searchLayout = new QHBoxLayout(searchWidget); - QLabel *searchLabel = new QLabel(searchWidget); - searchLabel->setText("Search:"); - searchLayout->addWidget(searchLabel); - QLineEdit *searchField = new QLineEdit(searchWidget); - searchLayout->addWidget(searchField); - - // Add search widget to toolbar - toolbar->addWidget(searchWidget); - addToolBar(toolbar); - // Central widget QWidget *centralWidget = new QWidget(this); setCentralWidget(centralWidget); @@ -104,12 +88,25 @@ d->kcsfpm->sort( 0 ); d->modview->setModel( d->kcsfpm ); - // Setup Dock Widget with groups + // Setup Dock Widget with groups and search field QDockWidget *groupdock = new QDockWidget(this); - d->groupview = new QListView(groupdock); + QWidget *leftPanel = new QWidget( this ); + QVBoxLayout *leftPanelLayout = new QVBoxLayout( leftPanel ); + + QHBoxLayout *searchLayout = new QHBoxLayout(); + QLabel *searchLabel = new QLabel(); + searchLabel->setText("Search:"); + searchLayout->addWidget(searchLabel); + QLineEdit *searchField = new QLineEdit(); + searchLayout->addWidget(searchField); + + leftPanelLayout->addLayout( searchLayout ); + + d->groupview = new QListView( ); d->groupview->setModel(d->modmodel->groupsModel()); + leftPanelLayout->addWidget( d->groupview ); - groupdock->setWidget(d->groupview); + groupdock->setWidget( leftPanel ); addDockWidget(Qt::LeftDockWidgetArea, groupdock); -- 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] r57034 - in /trunk/repair: package/yast2-repair.changes src/OSRFstab.ycp
by jreidinger＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: jreidinger Date: Wed Apr 29 15:16:18 2009 New Revision: 57034 URL: http://svn.opensuse.org/viewcvs/yast?rev=57034&view=rev Log: check usbfs only if system has usb and don't check floppy in fstab, as it is now obsolete (bnc#499208) Modified: trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRFstab.ycp Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Wed Apr 29 15:16:18 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 29 15:13:37 CEST 2009 - jreidinger(a)suse.cz + +- check for usbfs in fstab only if system has any usb (bnc#499208) +- don't check for floppy in fstab, as it is now obsolete + (bnc#499208) + +------------------------------------------------------------------- Wed Apr 29 14:12:07 CEST 2009 - jreidinger(a)suse.cz - remove obsolete call which breaks bugzilla Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=5703… ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Wed Apr 29 15:16:18 2009 @@ -730,10 +730,11 @@ y2milestone ("it is a device used by other entity (e.g. LVM, EVMS, MD): ignoring"); return true; } - else if ("cdrom" == part["found"]:"") + else if ("cdrom" == part["found"]:"" + || "floppy" == part["found"]:"") { // bug #185575 - y2milestone ("cdrom/dvd entry (%1) should not be in fstab", p); + y2milestone ("cdrom/dvd/floppy entry (%1) should not be in fstab", p); return true; } map disk = Storage::GetDiskPartition (part["device"]:""); @@ -1035,11 +1036,15 @@ union ( union (checked_partitions, swapable_partition_list), [ - fstab_defaults ["usb", "spec"]:"", fstab_defaults ["proc", "spec"]:"", fstab_defaults ["pts", "spec"]:"", ] ); + + if (Hotplug::haveUSB){ + dev2check = add(dev2check, fstab_defaults ["usb", "spec"]:""); + } + dev2check = (list<string>) union (dev2check, maplist (map d, StorageDevices::cddrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57033 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp src/include/repositories_include.ycp
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 14:52:50 2009 New Revision: 57033 URL: http://svn.opensuse.org/viewcvs/yast?rev=57033&view=rev Log: - replace only changed cells in the table after chaging repository URL - keep the current sorting order (bnc#475961), do not change the current item (bnc#411585) - preserve repository priority when changing URL - open create repository dialog in a new window, fixes broken UI caused by the previous fix (bnc#269034) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 29 14:52:50 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Apr 29 14:46:46 CEST 2009 - lslezak(a)suse.cz + +- replace only changed cells in the table after chaging repository + URL - keep the current sorting order (bnc#475961), do not change + the current item (bnc#411585) +- preserve repository priority when changing URL +- open create repository dialog in a new window, fixes broken UI + caused by the previous fix (bnc#269034) + +------------------------------------------------------------------- Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz - use URL.ycp for processing smb:// URLs (bnc#495109) 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 Apr 29 14:52:50 2009 @@ -972,6 +972,8 @@ boolean same_url = (url == old_url); + y2debug("same_url: %1 (old: %2, new: %3)", same_url, old_url, url); + // special check for cd:// and dvd:// repositories if (!same_url) { @@ -1013,28 +1015,54 @@ boolean auto_refresh = sourceState["autorefresh"]:true; boolean keeppackages = sourceState["keeppackages"]:false; boolean enabled = sourceState["enabled"]:true; - y2milestone("Restoring the original properties: enabled: %1, autorefresh: %2, keeppackages: %3", enabled, auto_refresh, keeppackages); + integer priority = sourceState["priority"]:default_priority; + y2milestone("Restoring the original properties: enabled: %1, autorefresh: %2, keeppackages: %3, priority: %4", enabled, auto_refresh, keeppackages, priority); // set the original properties addedSource["autorefresh"] = auto_refresh; addedSource["keeppackages"] = keeppackages; addedSource["enabled"] = enabled; + addedSource["priority"] = priority; - sourceStatesOut[idx] = addedSource; - } + // get the ID of the old repo and mark it for removal + integer srcid = sourceStatesOut[global_current, "SrcId"]:-1; + if (srcid != -1) + { + sourcesToDelete = add (sourcesToDelete, srcid); + SourceManager::just_removed_sources = add (SourceManager::just_removed_sources, srcid); + } + + // replace the data + sourceStatesOut[global_current] = addedSource; - deleteSource( global_current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); + // refresh only the name and URL in the table + UI::ChangeWidget(`id(`table), `Cell( global_current, 3), addedSource["name"]:""); + UI::ChangeWidget(`id(`table), `Cell( global_current, 5), url); + + fillCurrentRepoInfo(); + } } } else { y2milestone ("URL is the same, not recreating the source"); - sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ global_current ] = sourceState; - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); + + string new_name = SourceDialogs::GetRepoName(); + if (new_name != sourceState["name"]:"") + { + sourceState["name"] = new_name; + sourceStatesOut[ global_current ] = sourceState; + + // update only the name cell in the table + UI::ChangeWidget(`id(`table), `Cell( global_current, 3), new_name); + + fillCurrentRepoInfo(); + } + else + { + y2milestone("The repository name has not been changed"); + } + createResult = `ok; } 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 Apr 29 14:52:50 2009 @@ -41,7 +41,8 @@ return ret; } - define symbol createSource( string url, boolean plaindir, boolean download, string preffered_name ) ``{ + define symbol createSourceImpl(string url, boolean plaindir, boolean download, string preffered_name) + { y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", URL::HidePassword(url), plaindir, download, preffered_name); if ( url != "" ) @@ -340,6 +341,15 @@ } } +// start createSource() function in extra wizard dialog +symbol createSource(string url, boolean plaindir, boolean download, string preffered_name) +{ + Wizard::CreateDialog(); + symbol ret = createSourceImpl(url, plaindir, download, preffered_name); + Wizard::CloseDialog(); + return ret; +} + symbol StoreSource () { string url = SourceDialogs::GetURL (); string name = SourceDialogs::GetRepoName (); -- 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] r57032 - /tags/stable-2_18_2/repair/
by jreidinger＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: jreidinger Date: Wed Apr 29 14:13:33 2009 New Revision: 57032 URL: http://svn.opensuse.org/viewcvs/yast?rev=57032&view=rev Log: Created tag stable-2_18_2 for repair Added: tags/stable-2_18_2/repair/ - copied from r57031, trunk/repair/ -- 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] r57031 - in /trunk/repair: VERSION package/yast2-repair.changes
by jreidinger＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: jreidinger Date: Wed Apr 29 14:13:19 2009 New Revision: 57031 URL: http://svn.opensuse.org/viewcvs/yast?rev=57031&view=rev Log: dump version Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=57031&r1=5703… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Wed Apr 29 14:13:19 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Wed Apr 29 14:13:19 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 29 14:12:07 CEST 2009 - jreidinger(a)suse.cz + +- remove obsolete call which breaks bugzilla +- 2.18.2 + +------------------------------------------------------------------- Mon Apr 20 14:04:34 CEST 2009 - jreidinger(a)suse.cz - update minimal version for bootloaders -- 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] r57030 - in /trunk/perl-bindings/pluglib-bindings/swig: ./ blocxx/ generic/ stdc/ stl/
by lslezak＠svn.opensuse.org 29 Apr '09

29 Apr '09

Author: lslezak Date: Wed Apr 29 13:10:24 2009 New Revision: 57030 URL: http://svn.opensuse.org/viewcvs/yast?rev=57030&view=rev Log: - fixed $Id$ expansion Modified: trunk/perl-bindings/pluglib-bindings/swig/BloCxx.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/LiMaL.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/blocxx/hash.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/blocxx/sequence.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/blocxx/string.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/blocxx/types.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/generic/hash.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/generic/hash_list.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/generic/sequence.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/stdc/types.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/stl/hash.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/stl/sequence.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/stl/string.i (props changed) trunk/perl-bindings/pluglib-bindings/swig/stl/types.i (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0