Mailinglist Archive: yast-commit (864 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Mon Nov 12 23:14:48 2007
New Revision: 41987

URL: http://svn.opensuse.org/viewcvs/yast?rev=41987&view=rev
Log:
- read from correct config file (#337913)
- do not write translated "file"/"service" into DB (#337913) 
- 2.15.1


Modified:
    branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION
    
branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes
    branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp
    branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp

Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION?rev=41987&r1=41986&r2=41987&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION (original)
+++ branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION Mon Nov 12 23:14:48 
2007
@@ -1 +1 @@
-2.15.0
+2.15.1

Modified: 
branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes?rev=41987&r1=41986&r2=41987&view=diff
==============================================================================
--- 
branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes
 (original)
+++ 
branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes
 Mon Nov 12 23:14:48 2007
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Nov  6 11:30:48 CET 2007 - jsuchome@xxxxxxx
+
+- read from correct config file (#337913)
+- do not write translated "file"/"service" into DB (#337913) 
+- 2.15.1
+
+-------------------------------------------------------------------
 Tue Jun 12 13:21:29 CEST 2007 - jsuchome@xxxxxxx
 
 - check if resource group is installed before selecting it (#143273)

Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp?rev=41987&r1=41986&r2=41987&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp 
(original)
+++ branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp Mon 
Nov 12 23:14:48 2007
@@ -511,7 +511,7 @@
  */
 global define boolean ReadConfigFile () ``{
 
-    if (! FileUtils::Exists ("/etc/scpm.conf"))
+    if (! FileUtils::Exists ("/etc/sysconfig/scpm"))
        return false;
 
     scpm_conf = $[

Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp?rev=41987&r1=41986&r2=41987&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp (original)
+++ branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp Mon Nov 12 
23:14:48 2007
@@ -163,11 +163,17 @@
     // map for saving user_defined flags of each resource
     map user_defined   = $[];
 
+    // resource type (menu entry)
+    string filestring  = _("File");
+    // resource type (menu entry)
+    string servicestring= _("Service");
     map type2string    = $[
-       // resource type (menu entry)
-       "file"          : _("File"),
-       // resource type (menu entry)
-       "service"       : _("Service"),
+       "file"          : filestring,
+       "service"       : servicestring
+    ];
+    map string2type    = $[
+       filestring      : "file",
+       servicestring   : "service",
     ];
 
     /**
@@ -304,7 +310,8 @@
            if (service != "" && !has_resource (service,"service"))
            {
                y2debug ("new service %1 for group %2", service, groupname);
-               items = add (items, `item(`id(service), "", service,"service"));
+               items = add (items, `item(`id(service), "", service,
+                   type2string["service"]:"service"));
                user_defined [service] = true;
                UI::ChangeWidget(`id(`resources), `Items, items);
            }
@@ -315,7 +322,8 @@
            if (file != "" && !has_resource (file,"file"))
            {
                y2debug ("new file %1 for group %2", file, groupname);
-               items = add (items, `item(`id(file), "", file, "file"));
+               items = add (items, `item(`id(file), "", file,
+                   type2string["file"]:"file"));
                user_defined [file] = true;
                UI::ChangeWidget(`id(`resources), `Items, items);
            }
@@ -358,7 +366,7 @@
                return $[
                    "active"            : i[1]:"" == "X",
                    "name"              : i[2]:"",
-                   "type"              : i[3]:"",
+                   "type"              : string2type[i[3]:""]:(i[3]:""),
                    "user_defined"      : user_defined [ i[2]:""]:false
                ];
            });

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx