diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 456: Merging in updates to where xdg library is imported

Message ID 20111028145027.3652.10690.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

James Tunnicliffe Oct. 28, 2011, 2:50 p.m. UTC 
Merge authors:
  James Tunnicliffe (dooferlad)
Related merge proposals:
  https://code.launchpad.net/~dooferlad/linaro-image-tools/restore_xdg_import/+merge/80659
  proposed by: James Tunnicliffe (dooferlad)
  review: Approve - Mattias Backman (mabac)
------------------------------------------------------------
revno: 456 [merge]
committer: James Tunnicliffe <james.tunnicliffe@linaro.org>
branch nick: linaro-image-tools
timestamp: Fri 2011-10-28 15:48:30 +0100
message:
  Merging in updates to where xdg library is imported
modified:
  linaro_image_tools/fetch_image.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/fetch_image.py'
--- linaro_image_tools/fetch_image.py	2011-10-27 14:31:55 +0000
+++ linaro_image_tools/fetch_image.py	2011-10-28 11:30:44 +0000
@@ -36,6 +36,8 @@ 
 import threading
 import subprocess
 import utils
+import xdg.BaseDirectory as xdgBaseDir
+
 
 QEMU = "qemu"
 HARDWARE = "hardware"
@@ -529,10 +531,6 @@ 
     """Downloads files and creates images from them by calling
     linaro-media-create"""
     def __init__(self):
-        # Import xdg here so it isn't required to index the server.
-        # (package not installed)
-        import xdg.BaseDirectory as xdgBaseDir
-
         self.datadir = os.path.join(xdgBaseDir.xdg_data_home,
                                      "linaro",
                                      "image-tools",