Author: benjimanw Date: Fri Apr 4 14:42:33 2008 New Revision: 46094 URL: http://svn.opensuse.org/viewcvs/yast?rev=46094&view=rev Log: Prefer installing packages from repositories defined in the YMP. Added: trunk/metapackage/package/103.diff Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp trunk/metapackage/yast2-metapackage-handler.spec.in Added: trunk/metapackage/package/103.diff URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/103.diff?rev=46094&view=auto ============================================================================== --- trunk/metapackage/package/103.diff (added) +++ trunk/metapackage/package/103.diff Fri Apr 4 14:42:33 2008 @@ -0,0 +1,32 @@ +Index: src/OneClickInstallWorkerFunctions.ycp +=================================================================== +--- src/OneClickInstallWorkerFunctions.ycp (revision 46084) ++++ src/OneClickInstallWorkerFunctions.ycp (working copy) +@@ -141,8 +141,26 @@ + foreach (string name, packages, + { + print(sformat(_("Marking package %1 for installation"),name)); ++ if (!Pkg::PkgInstall(name)) +- //Prefer packages from repositories specified in the YMP +- boolean inYmpRepos = false; +- foreach (integer id, sourceids, + { +- y2debug("Looking for %1 in %2",name,id); +- inYmpRepos = Pkg::ResolvfableInstallRepo(name,`package,id); +- if (inYmpRepos) +- { +- y2debug("Found %1 in %2",name,id); +- break; +- } else +- { +- y2debug("Didn't find %1 in %2", name, id); +- } +- }); +- if (!inYmpRepos) +- y2debug("Didn't find %1 At ALL in any YMP repos",name); +- //If we didn't find it in the repos specified in the YMP try any repo. +- if (!inYmpRepos && !Pkg::PkgInstall(name)) +- { + print(sformat(_("Warning: package %1 could not be installed."),name)); + if(GUI) + OneClickInstallWorkerResponse::AddFailedPackage(name); Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapackage-handler.changes?rev=46094&r1=46093&r2=46094&view=diff ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Fri Apr 4 14:42:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 04 13:40:00 GMT 2008 - benji@opensuse.org + +- Prefer installing packages from repositories defined in the YMP. + +------------------------------------------------------------------- Sat Mar 29 12:00:00 GMT 2008 - benji@opensuse.org - Fix error stage reporting. Modified: trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp?rev=46094&r1=46093&r2=46094&view=diff ============================================================================== --- trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorkerFunctions.ycp Fri Apr 4 14:42:33 2008 @@ -141,7 +141,25 @@ foreach (string name, packages, { print(sformat(_("Marking package %1 for installation"),name)); - if (!Pkg::PkgInstall(name)) + //Prefer packages from repositories specified in the YMP + boolean inYmpRepos = false; + foreach (integer id, sourceids, + { + y2debug("Looking for %1 in %2",name,id); + inYmpRepos = Pkg::ResolvfableInstallRepo(name,`package,id); + if (inYmpRepos) + { + y2debug("Found %1 in %2",name,id); + break; + } else + { + y2debug("Didn't find %1 in %2", name, id); + } + }); + if (!inYmpRepos) + y2debug("Didn't find %1 At ALL in any YMP repos",name); + //If we didn't find it in the repos specified in the YMP try any repo. + if (!inYmpRepos && !Pkg::PkgInstall(name)) { print(sformat(_("Warning: package %1 could not be installed."),name)); if(GUI) Modified: trunk/metapackage/yast2-metapackage-handler.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/yast2-metapackage-handler.spec.in?rev=46094&r1=46093&r2=46094&view=diff ============================================================================== --- trunk/metapackage/yast2-metapackage-handler.spec.in (original) +++ trunk/metapackage/yast2-metapackage-handler.spec.in Fri Apr 4 14:42:33 2008 @@ -20,6 +20,7 @@ BuildRequires: update-desktop-files Patch0: SLE.diff +Patch1: 103.diff Requires: yast2-perl-bindings Requires: perl-XML-XPath @@ -46,6 +47,10 @@ %patch0 %endif +%if %suse_version <= 1030 +%patch1 +%endif + @BUILD@ @INSTALL@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org