1 |
commit: 1b4e2608f7463d98270c0b709cffe09d1b5d2d86 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 31 08:30:55 2016 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 31 08:30:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=1b4e2608 |
7 |
|
8 |
Disable eval again. |
9 |
|
10 |
* libs/core.bash.in (eval): Disable eval again, because the |
11 |
workaround for the rc module (sourcing functions.sh) is no longer |
12 |
needed. See also 2005-05-15 change by ciaranm. |
13 |
|
14 |
This partially reverts commit 76867bf1a47570cd9548100caed519252b5ced5a. |
15 |
|
16 |
ChangeLog | 6 ++++++ |
17 |
README | 2 +- |
18 |
libs/core.bash.in | 6 +++++- |
19 |
3 files changed, 12 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/ChangeLog b/ChangeLog |
22 |
index c7a54f6..80bc483 100644 |
23 |
--- a/ChangeLog |
24 |
+++ b/ChangeLog |
25 |
@@ -1,3 +1,9 @@ |
26 |
+2016-10-31 Ulrich Müller <ulm@g.o> |
27 |
+ |
28 |
+ * libs/core.bash.in (eval): Disable eval again, because the |
29 |
+ workaround for the rc module (sourcing functions.sh) is no longer |
30 |
+ needed. See also 2005-05-15 change by ciaranm. |
31 |
+ |
32 |
2016-10-30 Ulrich Müller <ulm@g.o> |
33 |
|
34 |
* configure.ac: Update version to 1.4.7. |
35 |
|
36 |
diff --git a/README b/README |
37 |
index 945dc41..de19882 100644 |
38 |
--- a/README |
39 |
+++ b/README |
40 |
@@ -34,7 +34,7 @@ Style Notes |
41 |
one tab per indent level, with each tab representing 4 places. |
42 |
* Avoid lines wider than 79 positions. |
43 |
* Public functions don't get the ``es_`` prefix, private functions do. |
44 |
-* eval is evil, so don't use it. |
45 |
+* eval is evil, so we disabled it. |
46 |
* Absolute paths to executables are not portable, so don't use them. |
47 |
|
48 |
|
49 |
|
50 |
diff --git a/libs/core.bash.in b/libs/core.bash.in |
51 |
index baddfde..4418d51 100644 |
52 |
--- a/libs/core.bash.in |
53 |
+++ b/libs/core.bash.in |
54 |
@@ -119,7 +119,11 @@ inherit() { |
55 |
done |
56 |
} |
57 |
|
58 |
-# GNU sed wrapper (sed or gsed, as determined by configure) |
59 |
+# make eval not work, because it's evil |
60 |
+eval() { |
61 |
+ die "Don't use eval. Find another way." |
62 |
+} |
63 |
+ |
64 |
sed() { |
65 |
command @SED@ "$@" |
66 |
} |