commit yast2-packager for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Fri May 1 00:49:25 CEST 2009. -------- --- yast2-packager/yast2-packager.changes 2009-04-23 15:46:25.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2009-04-29 17:53:48.000000000 +0200 @@ -1,0 +2,26 @@ +Wed Apr 29 14:46:46 CEST 2009 - lslezak@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) +- confirm adding of an already known repository (URL) (bnc#471054) +- 2.18.7 + +------------------------------------------------------------------- +Tue Apr 28 16:33:41 CEST 2009 - lslezak@suse.cz + +- use URL.ycp for processing smb:// URLs (bnc#495109) +- removed the extra error popup when adding a repository fails + (bnc#269034) + +------------------------------------------------------------------- +Thu Apr 23 17:16:36 CEST 2009 - lslezak@suse.cz + +- added a new progress dialog when registering a new repository, + download progresses are embedded into the progress dialog instead + of separate popups for each file (bnc#466808) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.18.6.tar.bz2 New: ---- yast2-packager-2.18.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.fuM505/_old 2009-05-01 00:36:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fuM505/_new 2009-05-01 00:36:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.18.6) +# spec file for package yast2-packager (Version 2.18.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-packager -Version: 2.18.6 +Version: 2.18.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.18.6.tar.bz2 +Source0: yast2-packager-2.18.7.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # HTTP.ycp @@ -78,7 +78,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.18.6 +%setup -n yast2-packager-2.18.7 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,23 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Wed Apr 29 2009 lslezak@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) +- confirm adding of an already known repository (URL) (bnc#471054) +- 2.18.7 +* Tue Apr 28 2009 lslezak@suse.cz +- use URL.ycp for processing smb:// URLs (bnc#495109) +- removed the extra error popup when adding a repository fails + (bnc#269034) +* Thu Apr 23 2009 lslezak@suse.cz +- added a new progress dialog when registering a new repository, + download progresses are embedded into the progress dialog instead + of separate popups for each file (bnc#466808) * Thu Apr 23 2009 lslezak@suse.cz - display an additional help when adding an ISO repository over FTP or HTTP protocol fails (bnc#341668) ++++++ yast2-packager-2.18.6.tar.bz2 -> yast2-packager-2.18.7.tar.bz2 ++++++ ++++ 5917 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/agents/zypp_repos.scr new/yast2-packager-2.18.7/agents/zypp_repos.scr --- old/yast2-packager-2.18.6/agents/zypp_repos.scr 2007-07-30 11:41:32.000000000 +0200 +++ new/yast2-packager-2.18.7/agents/zypp_repos.scr 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * * Example: SCR::Read (.zypp_repos, "/etc/zypp/repo.d/") * - * $Id:$ + * $Id: zypp_repos.scr 57028 2009-04-29 10:58:09Z lslezak $ */ .zypp_repos diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/configure.in new/yast2-packager-2.18.7/configure.in --- old/yast2-packager-2.18.6/configure.in 2009-04-23 15:51:34.000000000 +0200 +++ new/yast2-packager-2.18.7/configure.in 2009-04-29 17:49:21.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.18.6, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.18.7, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.6" +VERSION="2.18.7" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/Makefile.am new/yast2-packager-2.18.7/Makefile.am --- old/yast2-packager-2.18.6/Makefile.am 2009-04-23 15:51:35.000000000 +0200 +++ new/yast2-packager-2.18.7/Makefile.am 2009-04-29 17:49:21.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/inst_check_memsize.ycp new/yast2-packager-2.18.7/src/clients/inst_check_memsize.ycp --- old/yast2-packager-2.18.6/src/clients/inst_check_memsize.ycp 2007-11-09 13:37:09.000000000 +0100 +++ new/yast2-packager-2.18.7/src/clients/inst_check_memsize.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Checking whether system has enough memory (bugzilla #305554) * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id:$ + * $Id: inst_check_memsize.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/inst_custom_packages.ycp new/yast2-packager-2.18.7/src/clients/inst_custom_packages.ycp --- old/yast2-packager-2.18.6/src/clients/inst_custom_packages.ycp 2008-10-02 12:38:35.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/inst_custom_packages.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Client for 3rd prodcuts/addon products package installations * - * $Id:$ + * $Id: inst_custom_packages.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/inst_source.ycp new/yast2-packager-2.18.7/src/clients/inst_source.ycp --- old/yast2-packager-2.18.6/src/clients/inst_source.ycp 2007-08-21 11:16:27.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/inst_source.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -1,7 +1,7 @@ /** * Author: Ladislav Slezak <lslezak@suse.cz> * Summary: Alias for "repositories" module - * $Id:$ + * $Id: inst_source.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { string target = "repositories"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/key_manager.ycp new/yast2-packager-2.18.7/src/clients/key_manager.ycp --- old/yast2-packager-2.18.6/src/clients/key_manager.ycp 2008-06-10 15:18:36.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/key_manager.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Manages GPG keys in the package manager * - * $Id$ + * $Id: key_manager.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/repositories.ycp new/yast2-packager-2.18.7/src/clients/repositories.ycp --- old/yast2-packager-2.18.6/src/clients/repositories.ycp 2009-04-23 15:45:12.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/repositories.ycp 2009-04-29 17:48:42.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: repositories.ycp 56760 2009-04-10 15:36:36Z lslezak $ + * $Id: repositories.ycp 57037 2009-04-29 15:48:41Z lslezak $ * */ @@ -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"]:""; @@ -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,56 @@ 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; + // 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"]:""); + UI::ChangeWidget(`id(`table), `Cell( global_current, 5), url); - deleteSource( global_current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); + 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; } @@ -1445,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 + ) + ) + { + // ask again + ret = nil; + } + } + } + } + while (ret == nil); + y2milestone("Result: %1", ret); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/software_simple_proposal.ycp new/yast2-packager-2.18.7/src/clients/software_simple_proposal.ycp --- old/yast2-packager-2.18.6/src/clients/software_simple_proposal.ycp 2007-08-21 11:16:27.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/software_simple_proposal.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * * See also file proposal-API.txt for details. * - * $Id:$ + * $Id: software_simple_proposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/webpin_package_search.ycp new/yast2-packager-2.18.7/src/clients/webpin_package_search.ycp --- old/yast2-packager-2.18.6/src/clients/webpin_package_search.ycp 2009-03-06 08:22:23.000000000 +0100 +++ new/yast2-packager-2.18.7/src/clients/webpin_package_search.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Katarina Machalkova <kmachalkova@suse.cz> * Lukas Ocilka <locilka@suse.cz> * - * $Id:$ + * $Id: webpin_package_search.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This client provides UI for searching for packages * via Webpin XML. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/wrapper_slideshow_callbacks.ycp new/yast2-packager-2.18.7/src/clients/wrapper_slideshow_callbacks.ycp --- old/yast2-packager-2.18.6/src/clients/wrapper_slideshow_callbacks.ycp 2008-04-03 14:10:05.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/wrapper_slideshow_callbacks.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * required for removing the cyclic import dependency * between SlideShowCallbacks.ycp and SlideShow.ycp * - * $Id$ + * $Id: wrapper_slideshow_callbacks.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/clients/wrapper_storage.ycp new/yast2-packager-2.18.7/src/clients/wrapper_storage.ycp --- old/yast2-packager-2.18.6/src/clients/wrapper_storage.ycp 2008-10-23 12:58:54.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/wrapper_storage.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: A wrapper for Storage:: module, required for removing yast2-storage dependency * - * $Id$ + * $Id: wrapper_storage.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/include/key_manager_dialogs.ycp new/yast2-packager-2.18.7/src/include/key_manager_dialogs.ycp --- old/yast2-packager-2.18.6/src/include/key_manager_dialogs.ycp 2008-09-25 12:41:22.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/key_manager_dialogs.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Manages GPG keys in the package manager * - * $Id$ + * $Id: key_manager_dialogs.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/include/repositories_include.ycp new/yast2-packager-2.18.7/src/include/repositories_include.ycp --- old/yast2-packager-2.18.6/src/include/repositories_include.ycp 2009-04-23 15:45:13.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/repositories_include.ycp 2009-04-29 14:52:51.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: Include file to be shared by yast2-packager and yast2-add-on * - * $Id:$ + * $Id: repositories_include.ycp 57033 2009-04-29 12:52:50Z lslezak $ * */ @@ -21,6 +21,7 @@ import "Label"; import "SourceDialogs"; import "Report"; + import "Progress"; textdomain "packager"; @@ -36,13 +37,12 @@ boolean download_meta = true; boolean LicenseAccepted (integer id) { - Wizard::CreateDialog (); boolean ret = AddOnProduct::AcceptedLicenseAndInfoFile (id); - UI::CloseDialog (); 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 != "" ) @@ -64,6 +64,18 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + Progress::New ( + // TRANSLATORS: dialog caption + _("Adding a New Repository"), + " ", + 3, + [ _("Check Repository Type"), _("Add Repository"), _("Read Repository License") ], + [ _("Checking Repository Type"), _("Adding Repository"), _("Reading Repository License") ], + // TRANSLATORS: dialog help + _("<p>Please wait while the repository manager downloads the repository details...</p>") + ); + + Progress::NextStage(); string service_type = Pkg::ServiceProbe(url); y2milestone("Probed service type: %1", service_type); @@ -148,7 +160,7 @@ const string iso_prefix = "iso:"; if (substring(url, 0, size(iso_prefix)) == iso_prefix) { - y2milestone("ISO image detected, disabling autorefresh (%1)", url); + y2milestone("ISO image detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -156,7 +168,7 @@ boolean cd_scheme = contains(["cd", "dvd"], tolower(URL::Parse(url)["scheme"]:"")); if (cd_scheme) { - y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", url); + y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -242,8 +254,12 @@ repo_prop["base_urls"] = [ url ]; repo_prop["type"] = repo_type; + Progress::NextStage(); integer new_repo_id = Pkg::RepositoryAdd(repo_prop); - y2milestone("Added repository: %1: %2", new_repo_id, repo_prop); + + map<string,any> repo_prop_log = repo_prop; + repo_prop_log["base_urls"] = [ URL::HidePassword(url) ]; + y2milestone("Added repository: %1: %2", new_repo_id, repo_prop_log); newSources = add(newSources, new_repo_id); @@ -267,30 +283,36 @@ if ( size( newSources ) == 0 ) { - // popup message part 1 - string _msg1 = sformat( _("Unable to create repository -from URL '%1'."), URL::HidePassword(url) ); + y2error("Cannot add the repository"); if (regexpmatch(url, "\\.iso$")) { + // popup message part 1 + string msg = sformat( _("Unable to create repository +from URL '%1'."), URL::HidePassword(url) ); + map parsed_url = URL::Parse(url); string scheme = tolower(parsed_url["scheme"]:""); if (contains(["ftp", "sftp", "http", "https"], scheme)) { // error message - _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + msg = msg + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible. +Change the protocol or unpack the ISO image on the server side."); + + // popup message part 2 + msg = msg + "\n\n" + _("Change the URL and try again?"); + + boolean tryagain = Popup::YesNo(msg); + if (tryagain) return `again; } } - // popup message part 2 - string _msg2 = _("Try again?"); - boolean tryagain = Popup::YesNo( _msg1 + "\n" + Pkg::LastError() + "\n" + _msg2 ); - if ( tryagain ) return `again; - else return `cancel; + return `cancel; } else { + Progress::NextStage(); foreach( integer id, newSources, ``{ if (! LicenseAccepted (id)) { @@ -319,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 (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/include/storage_include.ycp new/yast2-packager-2.18.7/src/include/storage_include.ycp --- old/yast2-packager-2.18.6/src/include/storage_include.ycp 2007-05-18 10:05:58.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/storage_include.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Storage calls * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id:$ + * $Id: storage_include.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/modules/DefaultDesktop.ycp new/yast2-packager-2.18.7/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.18.6/src/modules/DefaultDesktop.ycp 2008-12-02 13:02:57.000000000 +0100 +++ new/yast2-packager-2.18.7/src/modules/DefaultDesktop.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Jiri Srain <jsrain@suse.cz> * Lukas Ocilka <locilka@suse.cz> * - * $Id:$ + * $Id: DefaultDesktop.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/modules/KeyManager.ycp new/yast2-packager-2.18.7/src/modules/KeyManager.ycp --- old/yast2-packager-2.18.6/src/modules/KeyManager.ycp 2008-02-13 12:19:16.000000000 +0100 +++ new/yast2-packager-2.18.7/src/modules/KeyManager.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Manages GPG keys in the package manager * Authors: Ladislav Slezák <lslezak@novell.com> * - * $Id$ + * $Id: KeyManager.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/modules/SourceDialogs.ycp new/yast2-packager-2.18.7/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.18.6/src/modules/SourceDialogs.ycp 2009-04-23 15:45:13.000000000 +0200 +++ new/yast2-packager-2.18.7/src/modules/SourceDialogs.ycp 2009-04-27 14:31:38.000000000 +0200 @@ -1262,7 +1262,7 @@ { string workgroup = (string)UI::QueryWidget (`id (`workgroup), `Value); if (type == `samba && size (workgroup) > 0) - directory = directory + ";workgroup=" + workgroup; + parsed["domain"] = workgroup; } parsed["path"] = directory; @@ -1494,14 +1494,7 @@ dir = sharepath[1]:""; if (dir == nil) dir = "/"; - string workgroup = ""; - if (regexpmatch (dir, "^.*;workgroup=[^;]+$")) - { - workgroup = regexpsub (dir, - "^.*;workgroup=([^;]+)$", "\\1"); - dir = regexpsub (dir, "^(.*);workgroup=[^;]+$", "\\1"); - } - UI::ChangeWidget (`id (`workgroup), `Value, workgroup); + UI::ChangeWidget (`id (`workgroup), `Value, parsed["domain"]:""); UI::ChangeWidget (`id (`share), `Value, share); } UI::ChangeWidget (`id (`dir), `Value, dir); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.18.7/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.18.6/src/modules/SourceManagerSLP.ycp 2008-04-01 10:21:24.000000000 +0200 +++ new/yast2-packager-2.18.7/src/modules/SourceManagerSLP.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <locilka@suse.cz> * Status: Work in Progress * - * $Id:$ + * $Id: SourceManagerSLP.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides a complete set of functions that allows you to search * and select a new SLP repository. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.18.6/VERSION new/yast2-packager-2.18.7/VERSION --- old/yast2-packager-2.18.6/VERSION 2009-04-23 15:45:19.000000000 +0200 +++ new/yast2-packager-2.18.7/VERSION 2009-04-29 17:45:52.000000000 +0200 @@ -1 +1 @@ -2.18.6 +2.18.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de