Merge lp:~xintx-ua/command-not-found/add-install-support into lp:~command-not-found-developers/command-not-found/trunk

[Serhiy]

Adding installation support.

[Zygmunt Krynicki (zyga)]

21 + locale.setlocale(locale.LC_ALL, '')

Why are you setting this?

+ if return_code not in (0,256): #256 = user rejected installation
29 + print >> sys.stderr, _("A problem occured during installation. apt-get returned %d") % return_code

I would just do if return_code != 0, I don't know if there is any value as the failing installation probably leaves enough information to the user anyway.

[lp:~xintx-ua/command-not-found/add-install-support]

145. By Serhiy on 2011-12-02

Fixes localized YESEXPR.

[Zygmunt Krynicki (zyga)]

Two more comments:

1) Get the input encoding from locale.getlocale(locale.LC_CTYPE)[1], don't hardcode UTF-8

Come to think of it perhaps that's the same way we should get the input string encoding (not locale.getpreferredencoding(), anyway, it's not something you need to fix in this patch.

2) Run pyflakes and pep8 on this code, it will show you a number of stylistic issues, I can fix that myself but I usually recommend submitters to do it if they can.

[lp:~xintx-ua/command-not-found/add-install-support]

146. By Serhiy on 2011-12-02

Deletes apt-get install exit status handling.

147. By Serhiy on 2011-12-02

Fixes encoding handling.

148. By Serhiy on 2011-12-02

Clean-up TODO.

[Zygmunt Krynicki (zyga)]

+1 apart from the locale.YESEXPR that is unusable IMHO. There is no way to display the pattern in a readable manner and there is no way to synchronize local translation to the value returned by the locale system. I'll patch this away and merge.

review: Approve

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2011-08-25 09:49:51 +0000
+++ CommandNotFound/CommandNotFound.py	2011-12-02 15:58:26 +0000
@@ -9,6 +9,9 @@
 import posix
 import string
 import sys
+import subprocess
+import locale
+import re
 
 _ = gettext.translation("command-not-found", fallback=True).ugettext
 
@@ -189,6 +192,15 @@
             xidx = -1
         return (yidx - xidx) or cmp(x, y)
 
+    def install_prompt(self, package_name):
+        if package_name:
+            pattern = re.compile(locale.nl_langinfo(locale.YESEXPR).decode(locale.getlocale(locale.LC_CTYPE)[1]))
+            answer = raw_input(_("Do you want to install it? (y/N)")).decode(locale.getlocale(locale.LC_CTYPE)[1])
+            if re.match(pattern, answer):
+                install_command = "sudo apt-get install %s" % package_name
+                print >> sys.stdout, "%s" % install_command
+                subprocess.call(install_command.split(), shell=False)
+
     def advise(self, command, ignore_installed=False):
         " give advice where to find the given command to stderr "
         def _in_prefix(prefix, command):
@@ -238,6 +250,7 @@
             elif self.user_can_sudo:
                 print >> sys.stderr, _("You can install it by typing:")
                 print >> sys.stderr, "sudo apt-get install %s" % packages[0][0]
+                self.install_prompt(packages[0][0])
             else:
                 print >> sys.stderr, _("To run '%(command)s' please ask your administrator to install the package '%(package)s'") % {'command': command, 'package': packages[0][0]}
             if not packages[0][1] in self.sources_list:

=== modified file 'command-not-found'
--- command-not-found	2011-09-20 13:48:59 +0000
+++ command-not-found	2011-12-02 15:58:26 +0000
@@ -23,6 +23,7 @@
 def enable_i18n():
     cnf = gettext.translation("command-not-found", fallback=True)
     cnf.install(unicode=True)
+    locale.setlocale(locale.LC_ALL, '')
 
 
 def fix_sys_argv(encoding=None):