From patchwork Fri Oct 28 14:50:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 4875 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9FFFC23E03 for ; Fri, 28 Oct 2011 14:50:35 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8BFBCA18659 for ; Fri, 28 Oct 2011 14:50:35 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so5527164faa.11 for ; Fri, 28 Oct 2011 07:50:35 -0700 (PDT) Received: by 10.223.91.73 with SMTP id l9mr2248281fam.22.1319813435080; Fri, 28 Oct 2011 07:50:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs13634lak; Fri, 28 Oct 2011 07:50:34 -0700 (PDT) Received: by 10.216.24.21 with SMTP id w21mr968180wew.57.1319813427738; Fri, 28 Oct 2011 07:50:27 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fh7si7226322wbb.38.2011.10.28.07.50.27 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Oct 2011 07:50:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RJnlL-0001GN-7A for ; Fri, 28 Oct 2011 14:50:27 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 2CF55E0801 for ; Fri, 28 Oct 2011 14:50:27 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 456 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Fri, 28 Oct 2011 14:50:27 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14197"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ae6b41ff8d9b5f6ffd64a2245b7b3e4bf683de06 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 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 === 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",