Merge lp:~gothicx/apport/cache_dir_remove into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

[Martin Pitt (pitti)]

Hello Marco,

Marco Rodrigues [2009-09-03 23:25 -0000]:
> - self.__launchpad = Launchpad(credentials, launchpad_instance, cache_dir)
> + self.__launchpad = Launchpad(credentials, launchpad_instance)

The official documentation says that this needs cache_dir:

  https://help.launchpad.net/API/launchpadlib

Why did you remove it?

Martin

--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)

[Marco Rodrigues (gothicx)]

Hi!

It worked without it. Check bug 416804 and Markus Korn comment. Maybe he didn't update the documentation.

> Hello Marco,
>
> Marco Rodrigues [2009-09-03 23:25 -0000]:
> > - self.__launchpad = Launchpad(credentials,
> launchpad_instance, cache_dir)
> > + self.__launchpad = Launchpad(credentials,
> launchpad_instance)
>
> The official documentation says that this needs cache_dir:
>
> https://help.launchpad.net/API/launchpadlib
>
> Why did you remove it?
>
> Martin
>
> --
> Martin Pitt | http://www.piware.de
> Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)

=== modified file 'apport/crashdb_impl/launchpad.py'
--- apport/crashdb_impl/launchpad.py	2009-09-03 18:24:32 +0000
+++ apport/crashdb_impl/launchpad.py	2009-09-03 23:18:02 +0000
@@ -72,8 +72,6 @@
         if self.__launchpad:
             return self.__launchpad
 
-        cache_dir = tempfile.mkdtemp()
-        atexit.register(shutil.rmtree, cache_dir)
         if self.options.get('staging') or os.getenv('APPORT_STAGING'):
             launchpad_instance = STAGING_SERVICE_ROOT
         else:
@@ -88,12 +86,12 @@
                 # use existing credentials
                 credentials = Credentials()
                 credentials.load(open(self.auth))
-                self.__launchpad = Launchpad(credentials, launchpad_instance, cache_dir)
+                self.__launchpad = Launchpad(credentials, launchpad_instance)
             else:
                 # get credentials and save them
                 try:
                     self.__launchpad = Launchpad.get_token_and_login('apport-collect',
-                            launchpad_instance, cache_dir)
+                            launchpad_instance)
                 except HTTPError, e:
                     print >> sys.stderr, 'Error connecting to Launchpad: %s\nYou have to allow "Change anything" privileges.' % str(e)
                     sys.exit(1)

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2009-09-03 14:21:12 +0000
+++ apport/hookutils.py	2009-09-03 22:56:31 +0000
@@ -94,7 +94,7 @@
 
     report['Lspci'] = command_output(['lspci','-vvnn'])
     report['Lsusb'] = command_output(['lsusb'])
-    report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
+    report['UdevDb'] = command_output(['udevadm', 'info', '--export-db | grep -vi label'])
 
     dmi_dir = '/sys/class/dmi/id'
     if os.path.isdir(dmi_dir):