Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Mon Oct 3 09:26:46 CEST 2011.
-------- --- openSUSE:Factory/yast2-packager/yast2-packager.changes 2011-09-23 12:53:18.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2011-09-23 16:53:21.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 23 09:05:03 UTC 2011 - [email protected] + +- code cleanup: dropped support for selections (replaced by + patterns long time ago) +- 2.21.17 + +------------------------------------------------------------------- +Fri Sep 23 09:52:19 CEST 2011 - [email protected] + +- added dialog titles +- 2.21.16 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.21.15.tar.bz2 New: ---- yast2-packager-2.21.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.hit61t/_old 2011-10-03 09:26:42.000000000 +0200 +++ /var/tmp/diff_new_pack.hit61t/_new 2011-10-03 09:26:42.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.21.15 -Release: 1 +Version: 2.21.17 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.21.15.tar.bz2 +Source0: yast2-packager-%{version}.tar.bz2 Prefix: /usr @@ -35,7 +35,8 @@ BuildRequires: yast2-transfer # String::FindMountPoint() -BuildRequires: yast2 >= 2.21.13 +# Wizard::SetDialogTitleAndIcon() +BuildRequires: yast2 >= 2.21.22 # Pkg::SetZConfig() BuildRequires: yast2-pkg-bindings >= 2.21.8 @@ -87,7 +88,6 @@ %package webpin - Group: System/YaST Summary: YaST2 - Webpin package search client @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.21.15 +%setup -n yast2-packager-%{version} %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.21.15.tar.bz2 -> yast2-packager-2.21.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/VERSION new/yast2-packager-2.21.17/VERSION --- old/yast2-packager-2.21.15/VERSION 2011-09-14 14:30:32.000000000 +0200 +++ new/yast2-packager-2.21.17/VERSION 2011-09-23 16:50:17.000000000 +0200 @@ -1 +1 @@ -2.21.15 +2.21.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/configure new/yast2-packager-2.21.17/configure --- old/yast2-packager-2.21.15/configure 2011-09-14 14:31:58.000000000 +0200 +++ new/yast2-packager-2.21.17/configure 2011-09-23 16:50:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.15. +# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.17. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.21.15' -PACKAGE_STRING='yast2-packager 2.21.15' +PACKAGE_VERSION='2.21.17' +PACKAGE_STRING='yast2-packager 2.21.17' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.21.15 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.21.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.21.15:";; + short | recursive ) echo "Configuration of yast2-packager 2.21.17:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.21.15 +yast2-packager configure 2.21.17 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.21.15, which was +It was created by yast2-packager $as_me 2.21.17, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.21.15' + VERSION='2.21.17' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.15" +VERSION="2.21.17" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.21.15, which was +This file was extended by yast2-packager $as_me 2.21.17, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.21.15 +yast2-packager config.status 2.21.17 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/configure.in new/yast2-packager-2.21.17/configure.in --- old/yast2-packager-2.21.15/configure.in 2011-09-14 14:31:56.000000000 +0200 +++ new/yast2-packager-2.21.17/configure.in 2011-09-23 16:50:45.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.21.15, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.21.17, 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.21.15" +VERSION="2.21.17" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/clients/inst_custom_packages.ycp new/yast2-packager-2.21.17/src/clients/inst_custom_packages.ycp --- old/yast2-packager-2.21.15/src/clients/inst_custom_packages.ycp 2010-10-12 16:23:58.000000000 +0200 +++ new/yast2-packager-2.21.17/src/clients/inst_custom_packages.ycp 2011-09-23 15:44:45.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Client for 3rd prodcuts/addon products package installations * - * $Id: inst_custom_packages.ycp 62608 2010-10-12 14:23:57Z lslezak $ + * $Id: inst_custom_packages.ycp 65997 2011-09-23 13:44:44Z lslezak $ * */ { @@ -64,7 +64,7 @@ if (result == `next) // packages selected ? { - boolean anyToDelete = Pkg::PkgAnyToDelete(); + boolean anyToDelete = Pkg::IsAnyResolvable(`package, `to_remove); SlideShow::SetLanguage (UI::GetLanguage(true)); PackageSlideShow::InitPkgData(false); SlideShow::OpenDialog(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/clients/inst_mediacopy.ycp new/yast2-packager-2.21.17/src/clients/inst_mediacopy.ycp --- old/yast2-packager-2.21.15/src/clients/inst_mediacopy.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.21.17/src/clients/inst_mediacopy.ycp 2011-09-23 14:48:38.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Copy Media to local disk * - * $Id: inst_mediacopy.ycp 39538 2007-07-19 13:05:40Z lslezak $ + * $Id: inst_mediacopy.ycp 65990 2011-09-23 12:48:37Z lslezak $ * */ { @@ -105,7 +105,7 @@ string tgt = sformat("%1/%2/CD%3", _export, distprod, i ); y2debug("tgt: %1", tgt ); //Popup::Message(sformat(_("Before... %1"), i )); - any dir = Pkg::SourceProvideDir(source, i , "."); + any dir = Pkg::SourceProvideDirectory(source, i , ".", false, false); //Popup::Message(sformat(_("After... %1"), i )); if (dir!=nil) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/clients/repositories.ycp new/yast2-packager-2.21.17/src/clients/repositories.ycp --- old/yast2-packager-2.21.15/src/clients/repositories.ycp 2011-06-28 11:37:38.000000000 +0200 +++ new/yast2-packager-2.21.17/src/clients/repositories.ycp 2011-09-23 11:04:59.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: repositories.ycp 64611 2011-06-28 09:37:37Z lslezak $ + * $Id: repositories.ycp 65955 2011-09-23 07:54:37Z visnov $ * */ @@ -1585,7 +1585,9 @@ Pkg::TargetInit("/", true); } - // check whether running as root + Wizard::SetDesktopTitleAndIcon("sw_source"); + + // check whether running as root if (! Confirm::MustBeRoot () || !PackageLock::Connect(false)["connected"]:false) { UI::CloseDialog (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/clients/sw_single.ycp new/yast2-packager-2.21.17/src/clients/sw_single.ycp --- old/yast2-packager-2.21.15/src/clients/sw_single.ycp 2011-07-26 14:28:01.000000000 +0200 +++ new/yast2-packager-2.21.17/src/clients/sw_single.ycp 2011-09-23 15:44:45.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 65012 2011-07-26 12:28:00Z lslezak $ + * $Id: sw_single.ycp 65997 2011-09-23 13:44:44Z lslezak $ * * Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol, * "repo_mgmt" : boolean ] @@ -47,7 +47,7 @@ { Wizard::CreateDialog(); - Wizard::SetDesktopIcon("sw_single"); + Wizard::SetDesktopTitleAndIcon("sw_single"); // a stage in the progress dialog list<string> stages = [_("Initialize the Target System"), _("Load the Configured Repositories")]; @@ -647,7 +647,7 @@ } SCR::Write (.target.ycp, "/var/lib/YaST2/failed_packages", []); - boolean anyToDelete = Pkg::PkgAnyToDelete(); + boolean anyToDelete = Pkg::IsAnyResolvable(`package, `to_remove); SlideShow::SetLanguage (UI::GetLanguage(true)); PackageSlideShow::InitPkgData(true); // force reinitialization SlideShow::OpenDialog(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/clients/webpin_package_search.ycp new/yast2-packager-2.21.17/src/clients/webpin_package_search.ycp --- old/yast2-packager-2.21.15/src/clients/webpin_package_search.ycp 2011-08-30 16:11:32.000000000 +0200 +++ new/yast2-packager-2.21.17/src/clients/webpin_package_search.ycp 2011-09-23 11:04:59.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Katarina Machalkova <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: webpin_package_search.ycp 65454 2011-08-30 14:11:31Z lslezak $ + * $Id: webpin_package_search.ycp 65955 2011-09-23 07:54:37Z visnov $ * * This client provides UI for searching for packages * via Webpin XML. @@ -293,7 +293,7 @@ true ); - Wizard::SetTitleIcon ("yast-webpin"); + Wizard::SetDesktopTitleAndIcon ("webpin"); Wizard::SetAbortButton (`cancel, Label::CancelButton()); UI::SetFocus(`id("search_text")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/modules/AddOnProduct.ycp new/yast2-packager-2.21.17/src/modules/AddOnProduct.ycp --- old/yast2-packager-2.21.15/src/modules/AddOnProduct.ycp 2011-08-31 14:20:55.000000000 +0200 +++ new/yast2-packager-2.21.17/src/modules/AddOnProduct.ycp 2011-09-23 16:19:45.000000000 +0200 @@ -1655,8 +1655,6 @@ Pkg::CallbackAcceptUnknownGpgKey(AddOnProduct::AcceptUnknownGpgKeyCallback); if( haskey( addon["signature-handling"]:$[], "import_gpg_key") ) Pkg::CallbackImportGpgKey(AddOnProduct::ImportGpgKeyCallback); - if( haskey( addon["signature-handling"]:$[], "accept_non_trusted_gpg_key") ) - Pkg::CallbackAcceptNonTrustedGpgKey(AddOnProduct::AcceptNonTrustedGpgKeyCallback); break; }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.15/src/modules/Packages.ycp new/yast2-packager-2.21.17/src/modules/Packages.ycp --- old/yast2-packager-2.21.15/src/modules/Packages.ycp 2011-09-14 12:53:49.000000000 +0200 +++ new/yast2-packager-2.21.17/src/modules/Packages.ycp 2011-09-23 13:26:00.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <[email protected]> * - * $Id: Packages.ycp 65713 2011-09-14 10:53:47Z lslezak $ + * $Id: Packages.ycp 65971 2011-09-23 11:26:00Z lslezak $ */ { @@ -73,7 +73,6 @@ list <map> cached_proposal_patterns = nil; list <map> cached_proposal_products = nil; list <map> cached_proposal_patches = nil; -list <map> cached_proposal_selections = nil; list <string> cached_proposal_languages = nil; global boolean install_sources = false; // Installing source packages ? @@ -108,11 +107,6 @@ boolean system_packages_selected = false; -// DefaultDesktop::PrefferedWindowManager -// global string window_manager = nil; - - global boolean using_patterns = false; - global list <map <string, string> > add_on_products_list = []; // summary functions @@ -124,7 +118,6 @@ cached_proposal_patterns = nil; cached_proposal_products = nil; cached_proposal_patches = nil; - cached_proposal_selections = nil; cached_proposal_languages = nil; } @@ -362,16 +355,6 @@ } } - if (contains (flags, `selection)) - { - list<string> selections = ListSelected (`selection, "+ %1"); - - if (size(selections) > 0) - { - output = (list<string>) add (output, _("Selections:<br>") + mergestring (selections, "<br>")); - } - } - if (contains (flags, `size)) { output = (list<string>)add (output, @@ -1639,7 +1622,10 @@ theSources = add (theSources, sp_source); if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed) - Pkg::SetSelection (ProductFeatures::GetStringFeature ("software", "base_selection")); + { + // selections not supported anymore, install a pattern + Pkg::ResolvableInstall(ProductFeatures::GetStringFeature ("software", "base_selection"), `pattern); + } FindAndRememberAddOnProductsFiles (initial_repository); } @@ -1909,9 +1895,6 @@ // selected patches list<map> selected_patches = filter(map p, Pkg::ResolvableProperties("", `patch, ""), {return p["status"]:`unknown == `selected;}); - // selected selections - list<map> selected_selections = filter(map s, Pkg::ResolvableProperties("", `selection, ""), {return s["status"]:`unknown == `selected;}); - // selected languages list<string> selected_languages = (list<string>)union([Pkg::GetPackageLocale()], Pkg::GetAdditionalLocales()); @@ -1919,7 +1902,7 @@ // if the package selection has not been changed the cache is up to date if (selected_packages == cached_proposal_packages && selected_patterns == cached_proposal_patterns && selected_products == cached_proposal_products && selected_patches == cached_proposal_patches - && selected_selections == cached_proposal_selections && selected_languages == cached_proposal_languages) + && selected_languages == cached_proposal_languages) { y2milestone("using cached software proposal"); return cached_proposal; @@ -1931,7 +1914,7 @@ // See also ResetProposalCache() else if (cached_proposal_packages != nil && cached_proposal_patterns != nil && cached_proposal_products != nil && cached_proposal_patches != nil - && cached_proposal_selections != nil && cached_proposal_languages != nil) + && cached_proposal_languages != nil) { y2error("invalid cache: the software selection has been chaged"); // bnc #436925 @@ -1947,7 +1930,7 @@ if (Installation::dirinstall_installing_into_dir && !force_reset && init_called) { return Summary ( - [ `product, `pattern, `selection, `size, `desktop ], + [ `product, `pattern, `size, `desktop ], false ); } @@ -2014,7 +1997,7 @@ // Question: is `desktop appropriate for SLE? map ret = Summary ( - [ `product, `pattern, `selection, `size, `desktop ], + [ `product, `pattern, `size, `desktop ], false); // TODO simple proposal @@ -2026,7 +2009,6 @@ cached_proposal_patterns = filter(map p, Pkg::ResolvableProperties("", `pattern, ""), {return p["status"]:`unknown == `selected;}); cached_proposal_products = filter(map p, Pkg::ResolvableProperties("", `product, ""), {return p["status"]:`unknown == `selected;}); cached_proposal_patches = filter(map p, Pkg::ResolvableProperties("", `patch, ""), {return p["status"]:`unknown == `selected;}); - cached_proposal_selections = filter(map s, Pkg::ResolvableProperties("", `selection, ""), {return s["status"]:`unknown == `selected;}); cached_proposal_languages = (list<string>)union([Pkg::GetPackageLocale()], Pkg::GetAdditionalLocales()); UI::CloseDialog(); continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
