Merge lp:~luke-stanley/command-not-found/command-not-found into lp:~command-not-found-developers/command-not-found/trunk

[voltlick]

Allows many more people to more easily install packages by prompting to install without them having to know about any flag to configure but also prompting if they want to disable assistance installing. (It's very easy to disable, and it still asks for permission each time of course.)
Instead of a more tricky environment switch it checks if ~/.config/DISABLE_COMMAND_NOT_FOUND_INSTALL_PROMPT exists to disable help or looks for touch ~/.config/COMMAND_NOT_FOUND_INSTALL_PROMPT to see that it is needed.

[Zygmunt Krynicki (zyga)]

Hi.

Thanks for your contribution. I don't think this can land as-is. Using ~/.config/*COMMAND_NOT_FOUND_* is certainly not in good tone (all-upper-caps, not using XDG_CONFIG_HOME).

I'm not sure if we should change how c-n-f operates in the way you've proposed. What I'd like to see instead is:

Use ConfigParser/configparser to load and write command-not-found settings from $XDG_CONFIG_HOME/command-not-found.conf. Have a few options that decide on what you want. Ensure that we're error resiliant (parser, issues, sane deefaults).

I cannot write that code myself at this time (busy) but if you're willing to iterate on your proposal this can eventually be merged.

Lastly. I'd like to see some discussion on <email address hidden> about this change. It's not major but just ask if anyone would oppose this change. It should be okay but for something that affects everyone using Ubuntu, it's worth to check.

If you need to chat about any of this in real time feel free to ping me (zyga) on #ubuntu-devel at any time. Thanks

review: Needs Fixing

Unmerged revisions

155. By voltlick on 2013-06-14

prompts the user once to ask for their preference on being asked about installing

154. By Michael Vogt on 2012-06-26

setup.py: call version 0.3 as its a python*3* verison ;)

153. By Michael Vogt on 2012-06-14

merged python3 port lp:~cjwatson/command-not-found/python3, thanks to Colin Watson

152. By Zygmunt Krynicki on 2012-06-03

Merge support for building pot files when running ./setup.py sdist

151. By Michael Vogt on 2012-01-13

merge from ubuntu but remove fixes we don't need

150. By Michael Vogt on 2012-01-13

cherry pick fixes from ubuntu

149. By Michael Vogt on 2012-01-13

merged lp:~mvo/command-not-found/remove-debian-dir

148. By Michael Vogt on 2012-01-13

merged lp:~mvo/command-not-found/install-prompt-env

147. By Michael Vogt on 2012-01-11

fix java recommends (LP: #853688)

146. By Zygmunt Krynicki on 2011-12-10

Merge improved zsh support from Alex Jurkiewicz

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2012-06-13 16:09:46 +0000
+++ CommandNotFound/CommandNotFound.py	2013-06-14 16:55:32 +0000
@@ -202,27 +202,39 @@
             xidx = -1
         # http://python3porting.com/differences.html#comparisons
         return (yidx - xidx) or ((x > y) - (x < y))
-
-    def install_prompt(self, package_name):
-        if not "COMMAND_NOT_FOUND_INSTALL_PROMPT" in os.environ:
-            return
-        if package_name:
-            prompt = _("Do you want to install it? (N/y)")
-            if sys.version >= '3':
-                answer = input(prompt)
-            else:
-                answer = raw_input(prompt)
+    def yes_or_no(self,prompt):
+        "Give prompt and return bool"
+        if sys.version >= '3':
+            answer = input(prompt)
+        else:
+            answer = raw_input(prompt)
             if sys.stdin.encoding and isinstance(answer, str):
                 # Decode the answer so that we get an unicode value
                 answer = answer.decode(sys.stdin.encoding)
-            if answer.lower() == _("y"):
-                if posix.geteuid() == 0:
-                    command_prefix = ""
-                else:
-                    command_prefix = "sudo "
-                install_command = "%sapt-get install %s" % (command_prefix, package_name)
-                print("%s" % install_command, file=sys.stdout)
-                subprocess.call(install_command.split(), shell=False)
+        if answer.lower() == _("y"):
+            return True
+        else:
+            return False
+    def install_prompt(self, package_name):
+        if package_name and not os.path.exists(os.path.expanduser("~/.config/DISABLE_COMMAND_NOT_FOUND_INSTALL_PROMPT")):
+            wants_help_in_general = False
+            if not os.path.exists(os.path.expanduser("~/.config/COMMAND_NOT_FOUND_INSTALL_PROMPT")):
+                wants_help_in_general = self.yes_or_no("Do you want to be offered the option to install packages when they are not found? (N/y)")
+                if wants_help_in_general == False:
+                    print ('To disable this prompt, you may enter this:')
+                    print ("touch ~/.config/DISABLE_COMMAND_NOT_FOUND_INSTALL_PROMPT")
+                if wants_help_in_general == True:
+                    os.system("touch ~/.config/COMMAND_NOT_FOUND_INSTALL_PROMPT")
+                    print ('Your preference has been set')
+            if (os.path.exists(os.path.expanduser("~/.config/COMMAND_NOT_FOUND_INSTALL_PROMPT"))) or (wants_help_in_general == True):    
+                if self.yes_or_no(_("Do you want to install it? (N/y)")):
+                    if posix.geteuid() == 0:
+                        command_prefix = ""
+                    else:
+                        command_prefix = "sudo "
+                    install_command = "%sapt-get install %s" % (command_prefix, package_name)
+                    print("%s" % install_command, file=sys.stdout)
+                    subprocess.call(install_command.split(), shell=False)
 
     def advise(self, command, ignore_installed=False):
         " give advice where to find the given command to stderr "