[aur-general] How do you deal with pkgver() & version controlled PKGBUILDs?
Hi, I'm using git to version control my PKGBUILDs. Most of them build stable versions of packages using a static pkgver; however, some of them build unstable versions (from git, hg, etc.), and make use of the pkgver() function to compute a pkgver on build time. The problem that I'm having is that whenever I build one of the unstable packages, the value of pkgver in the PKGBUILD get updated by pkgver(), which causes Git to think that the file has changed. If I ever want to commit changes to the PKGBUILD, I first have to change pkgver back to what it was to prevent spurious changes to pkgver to committed as well. I know I'm being pedantic, but if someone has already thought of a solution/fix, that would appreciated. Thanks, Jashandeep Sohi
Since this is a git question, it probably belongs on that project's mailing list. Anyhow, what I do is use git smudge/clean filters to ignore the line. Here's an example from a different application of smudge/clean filters of how to ignore specific lines in a file: http://stackoverflow.com/questions/16244969/how-to-tell-git-to-ignore-indivi... On Thu, Feb 12, 2015 at 10:11 PM, Jashandeep Sohi < jashandeep.s.sohi@gmail.com> wrote:
Hi,
I'm using git to version control my PKGBUILDs. Most of them build stable versions of packages using a static pkgver; however, some of them build unstable versions (from git, hg, etc.), and make use of the pkgver() function to compute a pkgver on build time.
The problem that I'm having is that whenever I build one of the unstable packages, the value of pkgver in the PKGBUILD get updated by pkgver(), which causes Git to think that the file has changed. If I ever want to commit changes to the PKGBUILD, I first have to change pkgver back to what it was to prevent spurious changes to pkgver to committed as well.
I know I'm being pedantic, but if someone has already thought of a solution/fix, that would appreciated.
Thanks, Jashandeep Sohi
You can use `git add --patch` to add specific portions of a file to the git staging area. git add --patch PKGBUILD git checkout -- PKGBUILD
I asked here because I was hoping perhaps there was some way of disabling makepkg from editing PKGBUILDs. But, thanks for the git based solution; it'll get the job done. Do you happen to know why makepkg needs to update the pkgver variable, if it could just run the pkgver function every time? On Thu, Feb 12, 2015 at 7:22 PM, Ido Rosen <ido@kernel.org> wrote:
Since this is a git question, it probably belongs on that project's mailing list.
Anyhow, what I do is use git smudge/clean filters to ignore the line. Here's an example from a different application of smudge/clean filters of how to ignore specific lines in a file:
http://stackoverflow.com/questions/16244969/how-to-tell-git-to-ignore-indivi...
On Thu, Feb 12, 2015 at 10:11 PM, Jashandeep Sohi < jashandeep.s.sohi@gmail.com> wrote:
Hi,
I'm using git to version control my PKGBUILDs. Most of them build stable versions of packages using a static pkgver; however, some of them build unstable versions (from git, hg, etc.), and make use of the pkgver() function to compute a pkgver on build time.
The problem that I'm having is that whenever I build one of the unstable packages, the value of pkgver in the PKGBUILD get updated by pkgver(), which causes Git to think that the file has changed. If I ever want to commit changes to the PKGBUILD, I first have to change pkgver back to what it was to prevent spurious changes to pkgver to committed as well.
I know I'm being pedantic, but if someone has already thought of a solution/fix, that would appreciated.
Thanks, Jashandeep Sohi
participants (3)
-
Ido Rosen
-
Jashandeep Sohi
-
Jeremy Audet