| Summary: | git.eclass: can't use experimental branch if last commit is on master | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Paweł Tomak <gentoo> |
| Component: | Eclasses | Assignee: | Alex Alexander (RETIRED) <wired> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | dberkholz, scarabeus |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
Why should this be issue of git eclass? You can specify COMMIT or branch. If you specify some COMMIT then it has priority over the branch. Probably should be issue for uzbl maintainer. (In reply to comment #1) > Why should this be issue of git eclass? > You can specify COMMIT or branch. > If you specify some COMMIT then it has priority over the branch. > > Probably should be issue for uzbl maintainer. > And what if I won't specify COMMIT but I specify BRANCH? Like in this ebuild? There is EGIT_BRANCH specified, but still it emerge master branch The problem is in the ebuild. The EGIT_BRANCH variable is supposed to be set in global scope before inherit. When it gets changed it also changes the EGIT_COMMIT correctly. So when they do it in some function then need to change both variables themselves. Just ignore the experimental useflag and do yourself a favor: add to make.conf uzbl_LIVE_BRANCH="name-of-the-branch-i-want" and be done with it. This way it is on user to decide what branch he wants and no need to mess with ebuild :] Ok, thanks :) Now I understand reassigning to maintainer of uzbl fixed by changing both variables, thanks for reporting :) |
Hi, I tried today to emerge www-client/uzbl-9999 with the experimental flag set. It emerged without a problem, but what I've found is that it emerged current master branch, and not experimental as it was supposed to. I did a little search in the ebuild and git.eclass. The ebuild output shows: * GIT update --> * repository: git://github.com/Dieterbe/uzbl.git * at the commit: bb9959c00b92633fd0970ef99e6b7a2c5bbc8416 * commit: master * branch: experimental * storage directory: "/usr/local/portage/distfiles/git-src/uzbl" Last commit was to master branch, and because of that if statement in git_branch function in git.eclass sets src variable to ${EGIT_COMMIT}, which is set to 'master' if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then branchname=tree-${EGIT_COMMIT} src=${EGIT_COMMIT} fi Reproducible: Always Steps to Reproduce: 1.set experimental flag in uzbl-9999 (tried only this ebuild) 2.emerge =www-client/uzbl-9999 Actual Results: Emerged version is from master branch Expected Results: Emerged version should be from experimental branch