Set install action only non chroot

desktop/cl_desktop.py

@@ -69,12 +69,12 @@ class Desktop:
         """
         Display templates are applied (--verbose)
         """
-        self.printWARNING(_("The following files were changed")+":")
+        self.printSUCCESS(_("The following files were changed")+":")
         for nameF in dirsFiles[1]:
             nameFile = nameF
             if nameFile[:1] != "/":
                 nameFile = "/" + nameFile
-            self.printWARNING(" "*5 + nameFile)
+            self.printSUCCESS(" "*5 + nameFile)
 
     def applyTemplatesFromUser(self):
         """Apply templates for user"""

desktop/variables/action.py

@@ -28,11 +28,10 @@ class VariableAcDesktopMerge(ReadonlyVariable):
     install this package
     """
     def get(self):
-        ret = ""
         action = self.Get("cl_action")
         if action in ("install","merge"):
-            ret = "up"
-        return ret
+            return "up"
+        return ""
 
 class VariableAcDesktopInstall(ReadonlyVariable):
     """
@@ -40,12 +39,13 @@ class VariableAcDesktopInstall(ReadonlyVariable):
     and "down" for uninstall
     """
     def get(self):
-        ret = ""
+        if self.Get('cl_chroot_status') == "on":
+            return ""
         action = self.Get("cl_action")
         if action in ("install","merge"):
-            ret = "up"
+            return "up"
         elif action == "uninstall":
-            ret = "down"
+            return "down"
         return ret
 
 class VariableAcDesktopDesktop(ReadonlyVariable):
@@ -53,8 +53,9 @@ class VariableAcDesktopDesktop(ReadonlyVariable):
     Action variable which has value "up" on user profile setup
     """
     def get(self):
-        ret = ""
+        if self.Get('cl_chroot_status') == "on":
+            return ""
         action = self.Get("cl_action")
         if action in ("desktop",):
-            ret = "up"
-        return ret
+            return "up"
+        return ""