Author: benjimanw Date: Fri Apr 4 15:07:44 2008 New Revision: 46100 URL: http://svn.opensuse.org/viewcvs/yast?rev=46100&view=rev Log: Diff for building on 10.3 and earlier. Modified: trunk/metapackage/VERSION trunk/metapackage/package/103.diff Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=46100&r1=46099&r2=46100&view=diff ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Fri Apr 4 15:07:44 2008 @@ -1 +1 @@ -0.8.1 +0.8.2 Modified: trunk/metapackage/package/103.diff URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/103.diff?rev=46100&r1=46099&r2=46100&view=diff ============================================================================== --- trunk/metapackage/package/103.diff (original) +++ trunk/metapackage/package/103.diff Fri Apr 4 15:07:44 2008 @@ -1,32 +1,21 @@ Index: src/OneClickInstallWorkerFunctions.ycp =================================================================== ---- src/OneClickInstallWorkerFunctions.ycp (revision 46084) +--- src/OneClickInstallWorkerFunctions.ycp (revision 46099) +++ src/OneClickInstallWorkerFunctions.ycp (working copy) -@@ -141,8 +141,26 @@ - foreach (string name, packages, - { +@@ -148,6 +148,7 @@ 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, + //Prefer packages from repositories specified in the YMP + boolean inYmpRepos = false; ++ /* + foreach (integer id, (list<integer>)merge(sourceids,deduped_repos), { -- 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); + y2debug("Looking for %1 in %2",name,id); +@@ -163,6 +164,7 @@ + }); + 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)) + { + -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org