Merge lp:~james-w/linaro-image-tools/package-fetcher-config-manager into lp:linaro-image-tools/11.11

[James Westby]

Hi,

Another small branch. PackageFetcher has a lifecycle, so making it suport
the context manager protocol makes sense. This branch does that and just adds
a smoke test that it can be used like that, and relies on the exiting tests
for the prepare and cleanup methods to test that they do the correct thing.

Thanks,

James

[lp:~james-w/linaro-image-tools/package-fetcher-config-manager]

113. By James Westby on 2010-09-10

Merge trunk.

[Michael Hudson-Doyle (mwhudson)]

Also fine.

 merge approved

Cheers,
mwh

review: Approve

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-02 23:04:32 +0000
+++ hwpack/packages.py	2010-09-10 16:11:18 +0000
@@ -159,6 +159,9 @@
         self.cache = Cache(rootdir=self.tempdir, memonly=True)
         self.cache.update()
         self.cache.open()
+        return self
+
+    __enter__ = prepare
 
     def cleanup(self):
         """Cleanup any remaining artefacts.
@@ -169,6 +172,10 @@
         if self.tempdir is not None and os.path.exists(self.tempdir):
             shutil.rmtree(self.tempdir)
 
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.cleanup()
+        return False
+
     def fetch_packages(self, packages):
         """Fetch the files for the given list of package names.
 

=== modified file 'hwpack/tests/test_packages.py'
--- hwpack/tests/test_packages.py	2010-09-02 23:04:32 +0000
+++ hwpack/tests/test_packages.py	2010-09-10 16:11:18 +0000
@@ -195,6 +195,14 @@
             open(os.path.join(
                 fetcher.tempdir, "etc", "apt", "apt.conf")).read())
 
+    def test_context_manager(self):
+        # A smoketest that PackageFetcher can be used as a context
+        # manager
+        with PackageFetcher([]) as fetcher:
+            tempdir = fetcher.tempdir
+            self.assertTrue(os.path.isdir(tempdir))
+        self.assertFalse(os.path.exists(tempdir))
+
     def get_fetcher(self, sources, architecture=None):
         fetcher = PackageFetcher(
             [s.sources_entry for s in sources], architecture=architecture)