From patchwork Fri Jul 1 14:58:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 2404 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 F09DE23F53 for ; Fri, 1 Jul 2011 14:58:23 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id BEC59A1891F for ; Fri, 1 Jul 2011 14:58:23 +0000 (UTC) Received: by qyk10 with SMTP id 10so806251qyk.11 for ; Fri, 01 Jul 2011 07:58:23 -0700 (PDT) Received: by 10.229.102.98 with SMTP id f34mr2699597qco.42.1309532303256; Fri, 01 Jul 2011 07:58:23 -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.48.135 with SMTP id r7cs106666qcf; Fri, 1 Jul 2011 07:58:23 -0700 (PDT) Received: by 10.227.24.74 with SMTP id u10mr2966375wbb.69.1309532301752; Fri, 01 Jul 2011 07:58:21 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id ev16si7167822wbb.55.2011.07.01.07.58.21; Fri, 01 Jul 2011 07:58:21 -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 1QcfAj-0001m6-5p for ; Fri, 01 Jul 2011 14:58:21 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 2AB6D2E889B for ; Fri, 1 Jul 2011 14:58:21 +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: 369 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 369: Use absolute imports for hardwarepack_format and FetchImage. Message-Id: <20110701145821.18032.75931.launchpad@loganberry.canonical.com> Date: Fri, 01 Jul 2011 14:58:21 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13333"; Instance="initZopeless config overlay" X-Launchpad-Hash: f67e57df36b5210d3d163e9a7bbb3b91c8476e30 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/use-absolute-imports/+merge/66167 proposed by: Mattias Backman (mabac) ------------------------------------------------------------ revno: 369 [merge] committer: Mattias Backman branch nick: trunk timestamp: Fri 2011-07-01 11:21:11 +0200 message: Use absolute imports for hardwarepack_format and FetchImage. modified: linaro_image_tools/hwpack/config.py linaro_image_tools/index_server.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/hwpack/config.py' --- linaro_image_tools/hwpack/config.py 2011-06-20 13:46:16 +0000 +++ linaro_image_tools/hwpack/config.py 2011-06-28 15:16:43 +0000 @@ -22,7 +22,7 @@ import ConfigParser import re -from hardwarepack_format import ( +from linaro_image_tools.hwpack.hardwarepack_format import ( HardwarePackFormatV1, HardwarePackFormatV2, ) === modified file 'linaro_image_tools/index_server.py' --- linaro_image_tools/index_server.py 2011-06-17 18:04:47 +0000 +++ linaro_image_tools/index_server.py 2011-06-29 06:29:34 +0000 @@ -22,10 +22,10 @@ import os import re -import FetchImage import urlparse import logging import bz2 +import linaro_image_tools.FetchImage RELEASES_WWW_DOCUMENT_ROOT = "/srv/releases.linaro.org/www/platform/" RELEASE_URL = "http://releases.linaro.org/platform/" @@ -41,7 +41,7 @@ def __init__(self): self.reset() self.db_file_name = "server_index" - self.db = FetchImage.DB(self.db_file_name) + self.db = linaro_image_tools.FetchImage.DB(self.db_file_name) def crawl(self): self.db.set_url_parse_info(self.url_parse)