From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 30 May 2006 14:05:17 +0300 From: "Kirill A. Shutemov" To: ALT Devel discussion list Message-ID: <20060530110516.GG8129@pc152.sam-solutions.net> References: <20060528164509.GD8129@pc152.sam-solutions.net> <20060528195157.GA13957@basalt.office.altlinux.org> <20060529071750.GE8129@pc152.sam-solutions.net> <20060529114125.GG4821@basalt.office.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZYOWEO2dMm2Af3e3" Content-Disposition: inline In-Reply-To: <20060529114125.GG4821@basalt.office.altlinux.org> User-Agent: Mutt/1.4.2.1i X-OriginalArrivalTime: 30 May 2006 10:57:10.0030 (UTC) FILETIME=[CC971AE0:01C683D7] Subject: Re: [devel] =?koi8-r?b?4dLIydcg88naycbB?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.7 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 10:57:41 -0000 Archived-At: List-Archive: List-Post: --ZYOWEO2dMm2Af3e3 Content-Type: multipart/mixed; boundary="3607uds81ZQvwCD0" Content-Disposition: inline --3607uds81ZQvwCD0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 15:41 Mon 29 May, Dmitry V. Levin wrote: > On Mon, May 29, 2006 at 10:17:50AM +0300, Kirill A. Shutemov wrote: > > =E6=CF=D2=CD=C1=D4 =D4=CF=C7=CF =DE=D4=CF =CF=D4=C4=C1=A3=D4 git-srpmim= port =CD=CF=D6=C5=D4 =CE=C5 =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=CF=D7=C1=D4=D8 = =D4=D2=C5=C2=CF=D7=C1=CE=C9=D1=CD > > =CF=D4=C4=C5=CC=D8=CE=CF =D7=DA=D1=D4=CF=C7=CF =CD=DC=CA=CE=D4=DC=CA=CE= =C5=D2=C1. =F1 =C2=D9 =D0=D2=C5=C4=D0=CF=DE=A3=CC =D3=C4=C5=CC=C1=D4=D8 =DC= =D4=CF =D7=D2=D5=DE=CE=D5=C0(=D3 > > =D0=CF=CD=CF=DD=D8=C0 =D3=D7=CF=C9=C8 =D3=CB=D2=C9=D0=D4=CF=D7). >=20 > =F1 =C2=D9=CC =C2=D9 =D2=C1=C4, =C5=D3=CC=C9 =C2=D9 =D0=D2=C5=C4=D0=CF=DE= =D4=C5=CE=C9=D1 =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=CF=D7=C1=CC=C9 =C9=CC=C9 =C8= =CF=D4=D1 =C2=D9 =D5 > git-srpmimport =C2=D9=CC=C1 =D7=CF=DA=CD=CF=D6=CE=CF=D3=D4=D8 =D3=CF=CF= =D4=D7=C5=D4=D3=D4=D7=CF=D7=C1=D4=D8 =D2=C1=DA=CE=D9=CD =D0=D2=C5=C4=D0=CF= =DE=D4=C5=CE=C9=D1=CD. =F7 =C1=D4=D4=C1=DE=C5 =D0=C1=D4=DE =C4=CC=D1 =D0=CF=C4=C4=C5=D2=D6=CB=C9 = =CD=C5=C7=D2=C1=C3=C9=C9 changelog'=C1 =C9=DA srpm =D7 git. --=20 Kirill A. Shutemov Belarus, Minsk E-mail: k.shutemov (AT) sam-solutions.net JID: kas (AT) altlinux.org ICQ: 152302675 =F7=D3=C5 =D7=C5=D2=CE=CF.. =D4=CF=CC=D8=CB=CF =C2=CF=CC=D8=DB=C1=D1 =D0=D2= =CF=D3=D8=C2=C1 - =DA=C1=D0=CF=CC=CE=D1=D4=D8 =CE=C1=DB=D5 bugzilla.altlinu= x.ru =D3=CF=CF=C2=DD=C5=CE=C9=D1=CD=C9 =CF=C2 =CF=DB=C9=C2=CB=C1=C8. =F0=CF=D7= =C5=D2=D8=D4=C5, =C9=C8 =CB=C1=CB =CD=C9=CE=C9=CD=D5=CD =D0=D2=CF=DE=C9=D4= =C1=C0=D4. =EB=C1=CB =CD=C1=CB=D3=C9=CD=D5=CD - =C9=D3=D0=D2=C1=D7=D1=D4. -- rider in community@ --3607uds81ZQvwCD0 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="srpmlog2gitlog.patch" Content-Transfer-Encoding: quoted-printable diff --git a/git-srpmimport b/git-srpmimport index b538b13..d0767a7 100755 --- a/git-srpmimport +++ b/git-srpmimport @@ -240,13 +240,14 @@ import() verbose "Processing $srpm" srpm=3D"$(readlink -ev "$srpm")" =20 - local header name version buildtime filelist author f + local header name version buildtime filelist changelog author message f header=3D"$(od -A n -N 8 -t x1 -- "$srpm")" && [ -n "$header" -a -z "${header## ed ab ee db ?? ?? 00 01}" ] && name=3D"$(rpmquery -p --qf '%{NAME}' -- "$srpm")" && version=3D"$(rpmquery -p --qf '%{VERSION}-%{RELEASE}' -- "$srpm")" && buildtime=3D"$(rpmquery -p --qf '%{BUILDTIME}' -- "$srpm")" && - filelist=3D"$(rpm2cpio "$srpm" |cpio --list --quiet )" || + filelist=3D"$(rpm2cpio "$srpm" |cpio --list --quiet )" && + changelog=3D"$(rpmquery -p --qf '%{CHANGELOGTEXT}' -- "$srpm")" || fatal "$srpm: Not a valid source rpm package" =20 author=3D"$(rpmquery -p --qf '%{CHANGELOGNAME}\n' -- "$srpm" | @@ -315,8 +316,9 @@ import() =20 optimize_rules "$gear_rules" =20 + message=3D`printf '%s\n\n%s' "$version" "$changelog"` TZ=3DUTC faketime -d "1970-01-01 $buildtime seconds" -- \ - git-commit -a -m "$version" ${author:+--author "$author"} + git-commit -a -m "$message" ${author:+--author "$author"} verbose "Committed $name $version" TZ=3DUTC faketime -d "1970-01-01 $buildtime seconds" -- \ git-tag -a -m "$name $version" "$version" --3607uds81ZQvwCD0-- --ZYOWEO2dMm2Af3e3 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEfCbsbWYnhzC5v6oRAnQ6AJ9ZcyNhE5GwzSCSXvs2FWktbkHCvgCfS/ya H9x0cHEau0jvyMDnq0Hkq78= =vr7l -----END PGP SIGNATURE----- --ZYOWEO2dMm2Af3e3--