From patchwork Fri Jul 22 22:38:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 3059 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 DD0E523F18 for ; Fri, 22 Jul 2011 22:38:21 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8C766A1844F for ; Fri, 22 Jul 2011 22:38:21 +0000 (UTC) Received: by qwb8 with SMTP id 8so1970069qwb.11 for ; Fri, 22 Jul 2011 15:38:21 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr1886917qcb.38.1311374300990; Fri, 22 Jul 2011 15:38:20 -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.229.217.78 with SMTP id hl14cs27031qcb; Fri, 22 Jul 2011 15:38:20 -0700 (PDT) Received: by 10.227.3.4 with SMTP id 4mr1729721wbl.35.1311374298988; Fri, 22 Jul 2011 15:38:18 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fe3si5375516wbb.27.2011.07.22.15.38.18; Fri, 22 Jul 2011 15:38:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QkOMM-0005eE-CV for ; Fri, 22 Jul 2011 22:38:18 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 5DCA92E8029 for ; Fri, 22 Jul 2011 22:38:18 +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: 386 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 386: Renamed fetch image tools in line with other applications in the linaro-image-tools repository. Message-Id: <20110722223818.5087.76673.launchpad@loganberry.canonical.com> Date: Fri, 22 Jul 2011 22:38:18 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13483"; Instance="initZopeless config overlay" X-Launchpad-Hash: 6a5dbe8675e18d3768857179639a29898a5f36ae Merge authors: James Tunnicliffe (dooferlad) Related merge proposals: https://code.launchpad.net/~dooferlad/linaro-image-tools/fetch_image_rename/+merge/68911 proposed by: James Tunnicliffe (dooferlad) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 386 [merge] committer: James Tunnicliffe branch nick: linaro-image-tools timestamp: Fri 2011-07-22 23:34:24 +0100 message: Renamed fetch image tools in line with other applications in the linaro-image-tools repository. renamed: fetch_image.py => linaro-fetch-image fetch_image_ui.py => linaro-fetch-image-ui linaro_image_tools/FetchImage.py => linaro_image_tools/fetch_image.py modified: linaro-fetch-image linaro-fetch-image-ui --- 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 === renamed file 'fetch_image.py' => 'linaro-fetch-image' --- fetch_image.py 2011-06-17 13:10:22 +0000 +++ linaro-fetch-image 2011-07-22 21:09:29 +0000 @@ -22,13 +22,13 @@ import sys import os -import linaro_image_tools.FetchImage as FetchImage +import linaro_image_tools.fetch_image as fetch_image import logging def main(): - file_handler = FetchImage.FileHandler() - config = FetchImage.FetchImageConfig() + file_handler = fetch_image.FileHandler() + config = fetch_image.FetchImageConfig() # Unfortunately we need to do a bit of a hack here and look for some # options before performing a full options parse. @@ -59,7 +59,7 @@ # Using the config we have, look up URLs to download data from in the # server index - db = FetchImage.DB(file_handler.index_file) + db = fetch_image.DB(file_handler.index_file) image_url, hwpack_url = db.get_image_and_hwpack_urls(config.args) === renamed file 'fetch_image_ui.py' => 'linaro-fetch-image-ui' --- fetch_image_ui.py 2011-07-22 16:42:58 +0000 +++ linaro-fetch-image-ui 2011-07-22 21:09:29 +0000 @@ -26,7 +26,7 @@ import sys import re import os -import linaro_image_tools.FetchImage as FetchImage +import linaro_image_tools.fetch_image as fetch_image import string import operator import Queue @@ -1202,7 +1202,7 @@ if(image_url and hwpack_url): - self.file_handler = FetchImage.FileHandler() + self.file_handler = fetch_image.FileHandler() self.timer = wx.Timer(self) self.Bind(wx.EVT_TIMER, self.timer_ping, self.timer) @@ -1469,8 +1469,8 @@ self.wizard.FindWindowById(wx.ID_FORWARD).Enable() def go(self): - file_handler = FetchImage.FileHandler() - self.config = FetchImage.FetchImageConfig() + file_handler = fetch_image.FileHandler() + self.config = fetch_image.FetchImageConfig() self.config.settings["force_download"] = False self.config.settings['compatable_hwpacks'] = ['foo'] @@ -1483,7 +1483,7 @@ # Using the config we have, look up URLs to download data from in # the server index - db = FetchImage.DB(file_handler.index_file) + db = fetch_image.DB(file_handler.index_file) # Create the wizard and the pages self.wizard = wiz.Wizard(self, -1, "Linaro Media Builder") === renamed file 'linaro_image_tools/FetchImage.py' => 'linaro_image_tools/fetch_image.py'