Author: mvidner
Date: Fri Jun 8 12:52:26 2007
New Revision: 38355
URL: http://svn.opensuse.org/viewcvs/yast?rev=38355&view=rev
Log:
Use xdg-su instead of kdesu.
Make local files work (by prepending "file://").
(applying patch sent by Benji on Jun 7)
Modified:
trunk/metapackage/MetaPackageHandler.ycp
Modified: trunk/metapackage/MetaPackageHandler.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/MetaPackageHandler.ycp?rev=38355&r1=38354&r2=38355&view=diff
==============================================================================
--- trunk/metapackage/MetaPackageHandler.ycp (original)
+++ trunk/metapackage/MetaPackageHandler.ycp Fri Jun 8 12:52:26 2007
@@ -64,6 +64,8 @@
string validPackageChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-";
string invalidURLChars = " |#$^*()'";
+ string SU_CMD = "xdg-su -c";
+
//strings used
string packagedescription = _("Select the software components you wish to install:");
string description = _("Select the software repositories you wish to subscribe to:");
@@ -85,11 +87,14 @@
string remainSubscribed = _("Remain subscribed to these repositories after installation");
string youWillRemainSubscribed = _("You will remain subscribed to these repositories after installation.");
string youWillNotRemainSubscribed = _("These repositories will only be added during installation, you will not remain subscribed.");
- string nb = _("NB:");
+ string nb = _("Note:");
list args = WFM::Args();
if (size(args) > 0)
metaPackageUrl = args[0]:metaPackageUrl;
+ if (substring(metaPackageUrl,0,1) == "/")
+ metaPackageUrl = "file://" + metaPackageUrl;
+
map