From patchwork Fri Aug 10 11:44:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 10675 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 B029023E29 for ; Fri, 10 Aug 2012 11:44:13 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 75B6CA18869 for ; Fri, 10 Aug 2012 11:44:13 +0000 (UTC) Received: by yhpp61 with SMTP id p61so1451430yhp.11 for ; Fri, 10 Aug 2012 04:44:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=hjjlic6g3ADVxoLeQonrShwd0O/wMxpPGqyU3XaUJ14=; b=VhRxfzINGjmDSeTAEBUcxd53Ue9OFCDUIhYEuq3EJfXFbQiawezCgIz69djxeD5reR P1J0RCQ5xtsf5deMEysR7w9Sge3ZVyY5JckHrX+bw4hNxr01zAbtZCukzuGvVoObzx1L LMYE7YhWg1y6W/EV+QmYHgSStSNKNiPRUT+gQjJjq6zoWOwEvZF5At/J1mzjzMK2muPK AS4X1OkGFjjNcftC4JIIEGM9RRyJGC1ajhrtNSiw07KTgwZ40+Ly7gSXMQg2x7Vx2Njb nSKMKXCtXYUBTFnm6lgsTEqCN2OkWsi1zqSmZ3Um8Kai5p8U+rWfN8se17Pni/c1QQbX iFgg== Received: by 10.50.6.229 with SMTP id e5mr1464713iga.9.1344599052821; Fri, 10 Aug 2012 04:44:12 -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.50.184.200 with SMTP id ew8csp56053igc; Fri, 10 Aug 2012 04:44:11 -0700 (PDT) Received: by 10.216.238.30 with SMTP id z30mr1451743weq.223.1344599051334; Fri, 10 Aug 2012 04:44:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id s61si5437009wem.72.2012.08.10.04.44.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 04:44:11 -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 1SzndS-0004p1-Jo for ; Fri, 10 Aug 2012 11:44:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8AEC8E0420 for ; Fri, 10 Aug 2012 11:44:10 +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: 547 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 547: Fix path creation Message-Id: <20120810114410.23190.44924.launchpad@ackee.canonical.com> Date: Fri, 10 Aug 2012 11:44:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15780"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 129591d79e75cca74cc5d394e9ac2dfe400b9ece X-Gm-Message-State: ALoCoQl++4RJi/X8Xt2nE+1TTs9YcARbPJMDqH7zB5HFC88SOhcLqyW2s0pnh6NpSficezfFnHzd Merge authors: Ricardo Salveti (rsalveti) Related merge proposals: https://code.launchpad.net/~rsalveti/linaro-image-tools/fixing-os-path-join/+merge/119100 proposed by: Ricardo Salveti (rsalveti) review: Approve - James Tunnicliffe (dooferlad) ------------------------------------------------------------ revno: 547 [merge] committer: James Tunnicliffe branch nick: linaro-image-tools timestamp: Fri 2012-08-10 12:43:03 +0100 message: Fix path creation modified: linaro-media-create --- 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-media-create' --- linaro-media-create 2012-08-09 12:08:40 +0000 +++ linaro-media-create 2012-08-09 23:00:50 +0000 @@ -181,7 +181,7 @@ # if not a debian compatible system, just extract the kernel packages extract_kpkgs = False if not path_in_tarfile_exists( - os.path.join(filesystem_dir, '/etc/debian_version'), args.binary): + os.path.join(filesystem_dir, 'etc', 'debian_version'), args.binary): extract_kpkgs = True ROOTFS_DIR = os.path.join(BIN_DIR, filesystem_dir)