Signed-off-by: Juan Quintela <quint...@redhat.com>
---
migration.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration.c b/migration.c
index 15d001e..c56d29c 100644
--- a/migration.c
+++ b/migration.c
@@ -132,9 +132,9 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict,
QObject **ret_data)
{
MigrationState *s = current_migration;
- if (s)
+ if (s && s->get_status(s) == MIG_STATE_ACTIVE) {
s->cancel(s);
-
+ }
return 0;
}
--
1.7.6.2
From arch-general-boun...@archlinux.org Tue Sep 20 06:25:30 2011
Return-path: <arch-general-boun...@archlinux.org>
Envelope-to: arch...@mail-archive.com
Delivery-date: Tue, 20 Sep 2011 06:25:30 -0700
Received: from exprod5mx205.postini.com ([64.18.0.64] helo=psmtp.com)
by mail-archive.com with smtp (Exim 4.69)
(envelope-from <arch-general-boun...@archlinux.org>)
id 1R60KI-0000fo-0i
for arch...@mail-archive.com; Tue, 20 Sep 2011 06:25:30 -0700
Received: from archlinux.org ([66.211.214.132]) by exprod5mx205.postini.com
([64.18.4.10]) with SMTP;
Tue, 20 Sep 2011 09:25:26 EDT
Received: from gudrun.archlinux.org (gudrun.archlinux.org [66.211.214.131])
by archlinux.org (Postfix) with ESMTP id 1138092022;
Tue, 20 Sep 2011 09:25:13 -0400 (EDT)
Received: from archlinux.org (gerolde.archlinux.org [66.211.214.132])
by gudrun.archlinux.org (Postfix) with ESMTP id 53C2B84092
for <arch-gene...@archlinux.org>; Tue, 20 Sep 2011 09:25:09 -0400 (EDT)
Received-SPF: pass (gmail.com ... _spf.google.com: 74.125.83.46 is authorized
to use 'xecy...@gmail.com' in 'mfrom' identity (mechanism 'ip4:74.125.0.0/16'
matched)) receiver=gerolde.archlinux.org; identity=mailfrom;
envelope-from="xecy...@gmail.com"; helo=mail-gw0-f46.google.com;
client-ip=74.125.83.46
Received: from mail-gw0-f46.google.com (mail-gw0-f46.google.com [74.125.83.46])
by archlinux.org (Postfix) with ESMTPS id 1DF5B92015
for <arch-gene...@archlinux.org>; Tue, 20 Sep 2011 09:25:08 -0400 (EDT)
Received: by gwb15 with SMTP id 15so691305gwb.33
for <arch-gene...@archlinux.org>; Tue, 20 Sep 2011 06:25:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
h=from:to:subject:references:date:in-reply-to:message-id:user-agent
:mime-version:content-type;
bh=O07F8dYDSDfdkCng/ohskr+1Ysz8wbqPvxhnfiuvMGA=;
b=sUwUrezTljJ7XZFEd19qkMfGM5iVrZtq+d6GCL8Sma7Dm4gYBe1ZO4clv3YOaEZh8Q
6K8vHy+p4ejg0JJ34RoNmrnj55OUp2cYoZaq2gzq/hKPQ+imQIgIcE41bwJuvcg//OqR
d8xx63JC2b2YA1k7QmCCCXpkmB6lNqj6W7zLY=
Received: by 10.68.29.129 with SMTP id k1mr6414660pbh.45.1316525116131;
Tue, 20 Sep 2011 06:25:16 -0700 (PDT)
Received: from localhost ([2001:da8:8000:e104:ca0a:a9ff:fe72:7a0d])
by mx.google.com with ESMTPS id i8sm6052325pbp.1.2011.09.20.06.25.12
(version=TLSv1/SSLv3 cipher=OTHER);
Tue, 20 Sep 2011 06:25:14 -0700 (PDT)
From: XeCycle <xecy...@gmail.com>
To: General Discussion about Arch Linux <arch-gene...@archlinux.org>
References: <87wrd5sw4b....@gmail.com> <1316409772-sup-2899@eris>
<87vcsnsi2h....@gmail.com> <20110920091118.GB22919@blizzard>
<871uvb8rbm....@gmail.com> <20110920102258.GB5917@blizzard>
Date: Tue, 20 Sep 2011 21:25:04 +0800
In-Reply-To: <20110920102258.GB5917@blizzard> (Lukas Fleischer's message of
"Tue, 20 Sep 2011 12:22:58 +0200")
Message-ID: <87wrd373db....@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha1; protocol="application/pgp-signature"
Subject: Re: [arch-general] Any suggestions on frequently rebuilding a git
package?
X-BeenThere: arch-gene...@archlinux.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: General Discussion about Arch Linux <arch-gene...@archlinux.org>
List-Id: General Discussion about Arch Linux <arch-general.archlinux.org>
List-Unsubscribe: <http://mailman.archlinux.org/mailman/options/arch-general>,
<mailto:arch-general-requ...@archlinux.org?subject=unsubscribe>
List-Archive: <http://mailman.archlinux.org/pipermail/arch-general>
List-Post: <mailto:arch-gene...@archlinux.org>
List-Help: <mailto:arch-general-requ...@archlinux.org?subject=help>
List-Subscribe: <http://mailman.archlinux.org/mailman/listinfo/arch-general>,
<mailto:arch-general-requ...@archlinux.org?subject=subscribe>
Errors-To: arch-general-boun...@archlinux.org
Sender: arch-general-boun...@archlinux.org
X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
X-pstn-settings: 4 (1.5000:1.5000) s cv gt3 gt2 gt1 r p m c
X-pstn-addresses: from <xecy...@gmail.com> [294/10]
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Lukas Fleischer <archli...@cryptocrack.de> writes:
> On Tue, Sep 20, 2011 at 06:02:21PM +0800, XeCycle wrote:
[...]
>> >> Well, this is my PKGBUILD-git.proto:
>> >>=20
>> >> 43 #
>> >> 44 # BUILD HERE
>> >> 45 #
>> >> 46 ./autogen.sh
>> >> 47 ./configure --prefix=3D/usr
>> >> 48 make
>> >>=20
>> >> Do you mean commenting 46 & 47?
>> >
>> > ----
>> > $ sed -n '47,48p' /usr/share/pacman/PKGBUILD-git.proto
>> > rm -rf "$srcdir/$_gitname-build"
>> > git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
>> > ----
>> >
>> > You should upgrade abs to 2.4.3-1.
>>=20
>> $ LC_ALL=3DC pacman -Qo /usr/share/pacman/PKGBUILD-git.proto=20
>> /usr/share/pacman/PKGBUILD-git.proto is owned by abs 2.4.3-1
>>=20
>> What's up?
>
> You either modified that file (use `pacman -S abs` to reinstall the
> package in that case) or use a weird editor with weird line numbering.
Oops, I got it. I used `nl', which ignored blank lines.
=2D-=20
Carl Lei (XeCycle)
Department of Physics, Shanghai Jiao Tong University
OpenPGP public key: 7795E591
Fingerprint: 1FB6 7F1F D45D F681 C845 27F7 8D71 8EC4 7795 E591
--=-=-=
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAEBAgAGBQJOeJQxAAoJEI1xjsR3leWRrIgIAIc4yhQBW5/PP173+C8Kh7J1
p5R+R+xZn/uSJ6oKkBsx8b76kfpus3d30P2rv7aUdb94ym/lNT9tvf09JXOHKowl
QOnjtTtSIqlGsNVOwTAJ2CTHl2h24dBrFibjDfvWP829+FHM/veHArYaJtt0YzfX
8KTVx3uGjAne07mK4bTngvOJ20t9LBnuW43lMl8q6bX+QPFL9Ca61q28PX9Ix3NR
OIYWjXpP/aN/2QFoPsulhndjyhg9RDVf9jQykdM4e3stfC7dkQuU06IP0eg4A2vT
jMEzpjn81y4OagRpevxfiG1tabNu+f0kpcqPZVNPpHCb/JXfNiqL0lPQVVKoyNg=
=bUhU
-----END PGP SIGNATURE-----
--=-=-=--
