From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id B873CE00D54; Thu, 9 Jun 2016 10:07:15 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.48 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 3710FE00D23 for ; Thu, 9 Jun 2016 10:07:13 -0700 (PDT) Received: by mail-wm0-f48.google.com with SMTP id k204so69340238wmk.0 for ; Thu, 09 Jun 2016 10:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=hN6qHwg8WDeXA+wJ9SBbSDMRgqTAYtXQ/a71BDu+8gQ=; b=Y6bviufCllbyQZowLB8jNHymJk21K6O9/VGAjyXDaWDNn7plSJPoBfTADRgQZwONLU qyP45UAoXQgrSf5EekC0eMIz19bVQiIIgZ9awQgaoWX+Wa7FNiTH1EwxTH1UC29hwNRn gecAVcfKifSbKUzzpCIFHR2QVvEZb9a70kDAyd2OSGFzyQNSu/H45TMWh17bMUOLkxKP 29tXOfu2kKriUkpjYpG0xl+Tb2q1Kaydj+uKuKXNZOiHoyKv6Y1ScFWaFFB/NSyGd1v3 edlonAahxBJIyVaB87QdapMO5ABTC0z/sPpGFuL6LtgLVvu0/i1ktX0SOj5rvXlT7uVk j3CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=hN6qHwg8WDeXA+wJ9SBbSDMRgqTAYtXQ/a71BDu+8gQ=; b=PFQ1ZTu6Ftc2np77pHBLnVlkCPJzM04Ag/BFHfV8kss/dy967qhRbSF+pnf8LR6z3M s0nQ79fpJO2CSGM7X/8mTmwg3AYDaG61/6ELPw9bjJzcx1z0xdbEq6mNIXbJOcw0Zfm4 VFBUthhdUm32Yag3lL6BqSD9p8wFnONz4AMtA0VxtSyFHyCkhY1vAZWCUCSmxRzC4vcr oJS1mloiQODDOSolO5EUc5plTPmHb15TiIcL31u5DEIaFdxf9ek2sFg7ksFSNcizO0mi aG3iIr9zvf2sEmo0nu8Wmvo1ztVfXbiRpW8M4ViPCq+GBdn1yRezROKqW8j2QbzAstBG dqBw== X-Gm-Message-State: ALyK8tITh+2Spkz+AFTgbMLEMCIMdyapeXYiNGsEXWxOEgPKaC2sX6pTn43znOFjJVEVscTv X-Received: by 10.194.21.39 with SMTP id s7mr9653301wje.24.1465492032868; Thu, 09 Jun 2016 10:07:12 -0700 (PDT) Received: from [192.168.2.143] ([83.217.123.106]) by smtp.googlemail.com with ESMTPSA id y3sm7992320wji.40.2016.06.09.10.07.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2016 10:07:09 -0700 (PDT) To: Elliot Smith , toaster@yoctoproject.org References: <1465313849-20109-1-git-send-email-elliot.smith@intel.com> <1465313849-20109-2-git-send-email-elliot.smith@intel.com> From: Michael Wood Message-ID: <5759A23D.3090106@intel.com> Date: Thu, 9 Jun 2016 18:07:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1465313849-20109-2-git-send-email-elliot.smith@intel.com> Cc: "Bartosh, Eduard" Subject: Re: [PATCH][v2 2/8] toaster: fix migrations X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2016 17:07:15 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Is this patch needed? I see this is in master already: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/bitbake?id=15bb3d4e7fd33a921e9b0681297dfee6986a66eb On 07/06/16 16:37, Elliot Smith wrote: > From: Ed Bartosh > > Signed-off-by: Ed Bartosh > --- > .../migrations/0004_auto_20160523_1446.py | 34 +++++++++ > .../orm/migrations/0007_auto_20160523_1446.py | 89 ++++++++++++++++++++++ > 2 files changed, 123 insertions(+) > create mode 100644 bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py > create mode 100644 bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py > > diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py b/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py > new file mode 100644 > index 0000000..3d90629 > --- /dev/null > +++ b/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py > @@ -0,0 +1,34 @@ > +# -*- coding: utf-8 -*- > +from __future__ import unicode_literals > + > +from django.db import migrations, models > + > + > +class Migration(migrations.Migration): > + > + dependencies = [ > + ('bldcontrol', '0003_add_cancelling_state'), > + ] > + > + operations = [ > + migrations.AlterField( > + model_name='buildenvironment', > + name='bbstate', > + field=models.IntegerField(default=0, choices=[(0, 'stopped'), (1, 'started')]), > + ), > + migrations.AlterField( > + model_name='buildenvironment', > + name='betype', > + field=models.IntegerField(choices=[(0, 'local')]), > + ), > + migrations.AlterField( > + model_name='buildenvironment', > + name='lock', > + field=models.IntegerField(default=0, choices=[(0, 'free'), (1, 'lock'), (2, 'running')]), > + ), > + migrations.AlterField( > + model_name='buildrequest', > + name='state', > + field=models.IntegerField(default=0, choices=[(0, 'created'), (1, 'queued'), (2, 'in progress'), (3, 'completed'), (4, 'failed'), (5, 'deleted'), (6, 'cancelling'), (7, 'archive')]), > + ), > + ] > diff --git a/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py b/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py > new file mode 100644 > index 0000000..b472e7c > --- /dev/null > +++ b/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py > @@ -0,0 +1,89 @@ > +# -*- coding: utf-8 -*- > +from __future__ import unicode_literals > + > +from django.db import migrations, models > + > + > +class Migration(migrations.Migration): > + > + dependencies = [ > + ('orm', '0006_add_cancelled_state'), > + ] > + > + operations = [ > + migrations.AlterField( > + model_name='build', > + name='outcome', > + field=models.IntegerField(default=2, choices=[(0, 'Succeeded'), (1, 'Failed'), (2, 'In Progress'), (3, 'Cancelled')]), > + ), > + migrations.AlterField( > + model_name='helptext', > + name='area', > + field=models.IntegerField(choices=[(0, 'variable')]), > + ), > + migrations.AlterField( > + model_name='layer', > + name='summary', > + field=models.TextField(default=None, null=True, help_text='One-line description of the layer'), > + ), > + migrations.AlterField( > + model_name='layer_version', > + name='local_path', > + field=models.FilePathField(default='/', max_length=1024), > + ), > + migrations.AlterField( > + model_name='layersource', > + name='sourcetype', > + field=models.IntegerField(choices=[(0, 'local'), (1, 'layerindex'), (2, 'imported')]), > + ), > + migrations.AlterField( > + model_name='logmessage', > + name='level', > + field=models.IntegerField(default=0, choices=[(0, 'info'), (1, 'warn'), (2, 'error'), (3, 'critical'), (-1, 'toaster exception')]), > + ), > + migrations.AlterField( > + model_name='package', > + name='installed_name', > + field=models.CharField(default='', max_length=100), > + ), > + migrations.AlterField( > + model_name='package_dependency', > + name='dep_type', > + field=models.IntegerField(choices=[(0, 'depends'), (1, 'depends'), (3, 'recommends'), (2, 'recommends'), (4, 'suggests'), (5, 'provides'), (6, 'replaces'), (7, 'conflicts')]), > + ), > + migrations.AlterField( > + model_name='recipe_dependency', > + name='dep_type', > + field=models.IntegerField(choices=[(0, 'depends'), (1, 'rdepends')]), > + ), > + migrations.AlterField( > + model_name='release', > + name='branch_name', > + field=models.CharField(default='', max_length=50), > + ), > + migrations.AlterField( > + model_name='releasedefaultlayer', > + name='layer_name', > + field=models.CharField(default='', max_length=100), > + ), > + migrations.AlterField( > + model_name='target_file', > + name='inodetype', > + field=models.IntegerField(choices=[(1, 'regular'), (2, 'directory'), (3, 'symlink'), (4, 'socket'), (5, 'fifo'), (6, 'character'), (7, 'block')]), > + ), > + migrations.AlterField( > + model_name='task', > + name='outcome', > + field=models.IntegerField(default=-1, choices=[(-1, 'Not Available'), (0, 'Succeeded'), (1, 'Covered'), (2, 'Cached'), (3, 'Prebuilt'), (4, 'Failed'), (5, 'Empty')]), > + ), > + migrations.AlterField( > + model_name='task', > + name='script_type', > + field=models.IntegerField(default=0, choices=[(0, 'N/A'), (2, 'Python'), (3, 'Shell')]), > + ), > + migrations.AlterField( > + model_name='task', > + name='sstate_result', > + field=models.IntegerField(default=0, choices=[(0, 'Not Applicable'), (1, 'File not in cache'), (2, 'Failed'), (3, 'Succeeded')]), > + ), > + ]