Author: benjimanw Date: Sun Mar 30 21:37:36 2008 New Revision: 45878 URL: http://svn.opensuse.org/viewcvs/yast?rev=45878&view=rev Log: Patch for SLE10SP1. Added: trunk/metapackage/package/SLE.diff Modified: trunk/metapackage/yast2-metapackage-handler.spec.in Added: trunk/metapackage/package/SLE.diff URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/SLE.diff?rev=45878&view=auto ============================================================================== --- trunk/metapackage/package/SLE.diff (added) +++ trunk/metapackage/package/SLE.diff Sun Mar 30 21:37:36 2008 @@ -0,0 +1,24 @@ +Index: src/OneClickInstallWorkerFunctions.ycp +=================================================================== +--- src/OneClickInstallWorkerFunctions.ycp (revision 45871) ++++ src/OneClickInstallWorkerFunctions.ycp (working copy) +@@ -102,9 +102,9 @@ + "alias":OneClickInstall::GetRepositoryName(new_url), + "base_urls":[new_url] + ]; +- integer srcid = Pkg::RepositoryAdd(repoData); +- boolean success = Pkg::SourceRefreshNow(srcid); +- if (!success) ++ integer srcid = Pkg::SourceCreate(new_url,"/"); ++ //boolean success = Pkg::SourceRefreshNow(srcid); ++ if (srcid <0) + { + if (Popup::YesNo (_("An error occurred while initializing the software repository.") + "\n" + _("Details:") + "\n" + Pkg::LastError() + "\n" + _("Try again?"))) + { +@@ -272,4 +272,4 @@ + return nil; + } + +-} +\ No newline at end of file ++} Modified: trunk/metapackage/yast2-metapackage-handler.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/yast2-metapackage-handler.spec.in?rev=45878&r1=45877&r2=45878&view=diff ============================================================================== --- trunk/metapackage/yast2-metapackage-handler.spec.in (original) +++ trunk/metapackage/yast2-metapackage-handler.spec.in Sun Mar 30 21:37:36 2008 @@ -19,6 +19,8 @@ # desktop files BuildRequires: update-desktop-files +Patch0: SLE.diff + Requires: yast2-perl-bindings Requires: perl-XML-XPath Requires: yast2 @@ -40,6 +42,11 @@ @PREP@ +%if %suse_version <= 1020 + %patch + %patch0 +%endif + @BUILD@ @INSTALL@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org