[Kimchi-devel] [PATCH V2 2/2] pep8 clean for osinfo.py
Shu Ming
shuming at linux.vnet.ibm.com
Mon Mar 10 15:19:29 UTC 2014
Aline,
Thanks for your hint, but no luck to work.
[tmp at localhost kimchi-clone]$ git am -3 /tmp/distros/\[Kimchi-devel\]\
\[PATCH\ V2\ 2_2\]\ pep8\ clean\ for\ osinfo.py.eml
Applying: pep8 clean for osinfo.py
fatal: sha1 information is lacking or useless (Makefile.am).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 pep8 clean for osinfo.py
The copy of the patch that failed is found in:
/home/tmp/kimchi-clone/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
2014/3/10 23:12, Aline Manera:
> On 03/10/2014 12:01 PM, Shu Ming wrote:
>> It seems that this patch need rebase.
>> [tmp at localhost kimchi-clone]$ git am /tmp/distros/\[Kimchi-devel\]\
>> \[PATCH\ V2\ 2_2\]\ pep8\ clean\ for\ osinfo.py.eml
>> Applying: pep8 clean for osinfo.py
>> error: patch failed: Makefile.am:53
>> error: Makefile.am: patch does not apply
>> Patch failed at 0001 pep8 clean for osinfo.py
>> The copy of the patch that failed is found in:
>> /home/tmp/kimchi-clone/.git/rebase-apply/patch
>> When you have resolved this problem, run "git am --resolved".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>>
>
> Ming, you can use "git am -3 <patches>"
> The -3 option auto-merge the patches for you.
>
> -3, --3way
> When the patch does not apply cleanly, fall back on 3-way
> merge if the patch records the identity of
> blobs it is supposed to apply to and we have those blobs
> available locally.
>
>>
>> 2014/3/10 22:39, shaohef at linux.vnet.ibm.com:
>>> From: ShaoHe Feng <shaohef at linux.vnet.ibm.com>
>>>
>>> pep8 clean for osinfo.py
>>> add the file to PEP8_WHITELIST
>>>
>>> Signed-off-by: ShaoHe Feng <shaohef at linux.vnet.ibm.com>
>>> ---
>>> Makefile.am | 1 +
>>> src/kimchi/osinfo.py | 30 ++++++++++++++++++------------
>>> 2 files changed, 19 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/Makefile.am b/Makefile.am
>>> index ddc39ac..2fdafb1 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -53,6 +53,7 @@ PEP8_WHITELIST = \
>>> src/kimchi/kvmusertests.py \
>>> src/kimchi/mockmodel.py \
>>> src/kimchi/model/*.py \
>>> + src/kimchi/osinfo.py \
>>> src/kimchi/repositories.py \
>>> src/kimchi/rollbackcontext.py \
>>> src/kimchi/root.py \
>>> diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
>>> index 905c63a..02dbabf 100644
>>> --- a/src/kimchi/osinfo.py
>>> +++ b/src/kimchi/osinfo.py
>>> @@ -15,7 +15,7 @@
>>> #
>>> # You should have received a copy of the GNU Lesser General Public
>>> # License along with this library; if not, write to the Free Software
>>> -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>>> 02110-1301 USA
>>> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>>> 02110-1301 USA
>>>
>>> import copy
>>> import glob
>>> @@ -40,12 +40,13 @@ modern_spec = dict(common_spec,
>>> disk_bus='virtio', nic_model='virtio')
>>>
>>>
>>> template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide',
>>> - nic_model='e1000',
>>> sound_model= 'ich6'),
>>> + nic_model='e1000',
>>> sound_model='ich6'),
>>> 'modern': dict(common_spec,
>>> disk_bus='virtio',
>>> nic_model='virtio',
>>> - sound_model= 'ich6')},
>>> + sound_model='ich6')},
>>> 'power': {'old': dict(common_spec, disk_bus='scsi',
>>> - nic_model='spapr-vlan', cdrom_bus='scsi',
>>> + nic_model='spapr-vlan',
>>> + cdrom_bus='scsi',
>>> kbd_bus='usb',
>>> mouse_bus='usb',
>>> memory=1280),
>>> 'modern': dict(common_spec,
>>> disk_bus='virtio',
>>> @@ -64,18 +65,24 @@ icon_available_distros = [icon[5:-4] for icon in
>>> glob.glob1('%s/images/'
>>>
>>> isolinks = {
>>> 'debian': {
>>> - 'squeeze':
>>> 'http://cdimage.debian.org/debian-cd/6.0.7-live/amd64/iso-hybrid/debian-live-6.0.7-amd64-gnome-desktop.iso',
>>> + 'squeeze':
>>> 'http://cdimage.debian.org/debian-cd/6.0.7-live/amd64/'
>>> + 'iso-hybrid/debian-live-6.0.7-amd64-gnome-desktop.iso',
>>> },
>>> 'ubuntu': {
>>> - 'raring':
>>> 'http://ubuntu-releases.cs.umn.edu/13.04/ubuntu-13.04-desktop-amd64.iso',
>>> + 'raring': 'http://ubuntu-releases.cs.umn.edu/13.04/'
>>> + 'ubuntu-13.04-desktop-amd64.iso',
>>> },
>>> 'opensuse': {
>>> - '12.3':
>>> 'http://suse.mirrors.tds.net/pub/opensuse/distribution/12.3/iso/openSUSE-12.3-DVD-x86_64.iso',
>>> + '12.3':
>>> 'http://suse.mirrors.tds.net/pub/opensuse/distribution/12.3/'
>>> + 'iso/openSUSE-12.3-DVD-x86_64.iso',
>>> },
>>> 'fedora': {
>>> - '16':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/16/Live/x86_64/Fedora-16-x86_64-Live-Desktop.iso',
>>> - '17':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/x86_64/Fedora-17-x86_64-Live-Desktop.iso',
>>> - '18':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso',
>>> + '16':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/16/Live/'
>>> + 'x86_64/Fedora-16-x86_64-Live-Desktop.iso',
>>> + '17':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/'
>>> + 'x86_64/Fedora-17-x86_64-Live-Desktop.iso',
>>> + '18':
>>> 'http://fedora.mirrors.tds.net/pub/fedora/releases/18/Live/'
>>> + 'x86_64/Fedora-18-x86_64-Live-Desktop.iso',
>>> },
>>> }
>>>
>>> @@ -85,7 +92,6 @@ defaults = {'networks': ['default'],
>>> 'graphics': {'type': 'vnc', 'listen': '0.0.0.0'}}
>>>
>>>
>>> -
>>> def _get_arch():
>>> for arch, sub_archs in SUPPORTED_ARCHS.iteritems():
>>> if os.uname()[4] in sub_archs:
>>> @@ -107,7 +113,7 @@ def lookup(distro, version):
>>>
>>> if distro in modern_version_bases[arch]:
>>> if LooseVersion(version) >= LooseVersion(
>>> - modern_version_bases[arch][distro]):
>>> + modern_version_bases[arch][distro]):
>>> params.update(template_specs[arch]['modern'])
>>> else:
>>> params.update(template_specs[arch]['old'])
>>
>> _______________________________________________
>> Kimchi-devel mailing list
>> Kimchi-devel at ovirt.org
>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>>
>
More information about the Kimchi-devel
mailing list