1 |
commit: 75e7e8ee811907e97571ef9b352b5a15c6883ed4 |
2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 22 22:33:44 2011 +0000 |
4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 22 22:33:44 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=75e7e8ee |
7 |
|
8 |
[git-2] Cleanup parsing of LIVE_* variables. Add missing quotes. Update english in comment. |
9 |
|
10 |
--- |
11 |
eclass/git-2.eclass | 31 +++++++++++-------------------- |
12 |
1 files changed, 11 insertions(+), 20 deletions(-) |
13 |
|
14 |
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass |
15 |
index 43241db..dc7fa7c 100644 |
16 |
--- a/eclass/git-2.eclass |
17 |
+++ b/eclass/git-2.eclass |
18 |
@@ -5,7 +5,8 @@ |
19 |
# @ECLASS: git-2.eclass |
20 |
# @MAINTAINER: |
21 |
# Tomas Chvatal <scarabeus@g.o> |
22 |
-# @BLURB: This eclass provides functions for fetch and unpack git repositories |
23 |
+# @BLURB: |
24 |
+# This eclass provides functions for fetching and unpacking git repositories. |
25 |
# @DESCRIPTION: |
26 |
# Eclass for easing maitenance of live ebuilds using git as remote repository. |
27 |
# Eclass support working with git submodules and branching. |
28 |
@@ -27,6 +28,8 @@ EGIT_SOURCEDIR="${WORKDIR}/${P}" |
29 |
git-2_init_variables() { |
30 |
debug-print-function ${FUNCNAME} "$@" |
31 |
|
32 |
+ local x |
33 |
+ |
34 |
# @ECLASS-VARIABLE: EGIT_STORE_DIR |
35 |
# @DESCRIPTION: |
36 |
# Storage directory for git sources. |
37 |
@@ -65,12 +68,8 @@ git-2_init_variables() { |
38 |
# |
39 |
# Support multiple values: |
40 |
# EGIT_REPO_URI="git://a/b.git http://c/d.git" |
41 |
- eval X="\$${PN//[-+]/_}_LIVE_REPO" |
42 |
- if [[ ${X} = "" ]]; then |
43 |
- : ${EGIT_REPO_URI:=} |
44 |
- else |
45 |
- EGIT_REPO_URI="${X}" |
46 |
- fi |
47 |
+ eval x="\$${PN//[-+]/_}_LIVE_REPO" |
48 |
+ EGIT_REPO_URI=${x:-${EGIT_REPO_URI}} |
49 |
[[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value." |
50 |
|
51 |
# @ECLASS-VARIABLE: EVCS_OFFLINE |
52 |
@@ -83,22 +82,14 @@ git-2_init_variables() { |
53 |
# @ECLASS-VARIABLE: EGIT_BRANCH |
54 |
# @DESCRIPTION: |
55 |
# Specify the branch we want to check out from the repository |
56 |
- eval X="\$${PN//[-+]/_}_LIVE_BRANCH" |
57 |
- if [[ "${X}" = "" ]]; then |
58 |
- : ${EGIT_BRANCH:=${EGIT_MASTER}} |
59 |
- else |
60 |
- EGIT_BRANCH="${X}" |
61 |
- fi |
62 |
+ eval x="\$${PN//[-+]/_}_LIVE_BRANCH" |
63 |
+ EGIT_BRANCH=${x:-${EGIT_BRANCH:=${EGIT_MASTER}}} |
64 |
|
65 |
# @ECLASS-VARIABLE: EGIT_COMMIT |
66 |
# @DESCRIPTION: |
67 |
# Specify commit we want to check out from the repository. |
68 |
- eval X="\$${PN//[-+]/_}_LIVE_COMMIT" |
69 |
- if [[ "${X}" = "" ]]; then |
70 |
- : ${EGIT_COMMIT:=${EGIT_BRANCH}} |
71 |
- else |
72 |
- EGIT_COMMIT="${X}" |
73 |
- fi |
74 |
+ eval x="\$${PN//[-+]/_}_LIVE_COMMIT" |
75 |
+ EGIT_COMMIT=${x:-${EGIT_COMMIT:=${EGIT_BRANCH}}} |
76 |
|
77 |
# @ECLASS-VARIABLE: EGIT_REPACK |
78 |
# @DESCRIPTION: |
79 |
@@ -410,7 +401,7 @@ git-2_src_unpack() { |
80 |
|
81 |
git-2_init_variables |
82 |
git-2_prepare_storedir |
83 |
- git-2_fetch $@ |
84 |
+ git-2_fetch "$@" |
85 |
git-2_gc |
86 |
git-2_move_source |
87 |
git-2_branch |