----- "Bill Peck" <bpeck(a)redhat.com> wrote:
From: "Bill Peck" <bpeck(a)redhat.com>
To: beaker-devel(a)lists.fedorahosted.org
Sent: Wednesday, January 6, 2010 12:11:51 AM GMT +10:00 Brisbane
Subject: Re: [Beaker-devel] updated spec file
On 01/04/2010 09:02 PM, Raymond Mancy wrote:
> ----- "Bill Peck"<bpeck(a)redhat.com> wrote:
>
>
>> From: "Bill Peck"<bpeck(a)redhat.com>
>> To: "List for the development of the Beaker
project"<beaker-devel(a)lists.fedorahosted.org>
>> Sent: Tuesday, January 5, 2010 7:36:47 AM GMT +10:00 Brisbane
>> Subject: [Beaker-devel] updated spec file
>>
>> Hello Everyone,
>>
>> I've updated the beaker spec file to do some magic with regard to
git.
>>
>> If you have a branch checked out and do a make snaparchive and then
a
>>
>> make srpm or rpm it will have the timestamp and branch name in the
>> release.
>>
>> for example:
>>
>>
/home/bpeck/Sandbox/Beaker/rpm-build/beaker-0.4.71-0.1262640463.ticket51.el5.src.rpm
>>
>>
> I seem to be having a problem with this. From the master branch I do
the following
>
> git branch bz537414
> git checkout bz537414
^^^^
This is how I'm creating my branches
> *edit stuff*
> *git add and commit*
> make snaparchive
> make rpm
>
> What follows is a bunch of expected out put as well as this
>
> error: Could not open
/home/raymond/dev/Beaker/arch_bug/rpm-build/noarch/beaker-0.4.72-0.1262654333.refs/heads/bz537414.noarch.rpm:
No such file or directory
>
> I tried creating a different branch and I got the same results. It's
quite possible I'm just doing something wrong.
>
Can you paste the results of the following command here?
git log --pretty=format:" %at.%d" -1
Both from master and from a couple of your branches.
Thanks!
This is the output from one branch that was playing up.
[root@localhost arch_bug]# git log --pretty=format:" %at.%d" -1
1262655692. (refs/heads/test_branch)
This was from master
[root@localhost arch_bug]# git log --pretty=format:" %at.%d " -1
1262640544. (refs/remotes/origin/master, refs/remotes/origin/HEAD, refs/heads/master,
refs/heads/bz552451)
I actually fixed the problem. I created patches of my changes, recreated the
branches from fresh and applied the patches onto the newly branches. Everything then
worked
as it should've. So it would appear it was something I had done wrong initially,
what it was though I don't know.
Cheers
>
>> But if you do the same from master it will just be:
>>
>> /home/bpeck/Sandbox/Beaker/rpm-build/beaker-0.4.71-0.el5.src.rpm
>>
>>
> This works for me just fine.
>
>
>> This allows for really easy testing of branches without needing to
>> update the spec file and check that into git. Which is always a
pain
>>
>> because it will no doubt conflict with master when you try and
merge
>> it
>> later.
>>
>> I also created a subpackage called beaker which only contains
>> beaker/__init__.py with __version__ = '0.4.71' in it. The idea is
to
>>
>> update the web templates to display this version on the web page
and
>> possibly pre-populate a bugzilla url with the right version.
>>
>> Let me know if you have any questions or see any problems.
>> _______________________________________________
>> Beaker-devel mailing list
>> Beaker-devel(a)lists.fedorahosted.org
>>
https://fedorahosted.org/mailman/listinfo/beaker-devel
>>
> _______________________________________________
> Beaker-devel mailing list
> Beaker-devel(a)lists.fedorahosted.org
>
https://fedorahosted.org/mailman/listinfo/beaker-devel
>
_______________________________________________
Beaker-devel mailing list
Beaker-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/beaker-devel