| 1 |
ulm 14/03/28 15:08:16 |
| 2 |
|
| 3 |
Modified: check-reqs.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Output binary prefixes for units according to IEC 80000-13, as calculations are 1024 based. Fix documentation of check-reqs_get_unit function, and other minor fixes. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.14 eclass/check-reqs.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.14&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.14&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.13&r2=1.14 |
| 13 |
|
| 14 |
Index: check-reqs.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v |
| 17 |
retrieving revision 1.13 |
| 18 |
retrieving revision 1.14 |
| 19 |
diff -u -r1.13 -r1.14 |
| 20 |
--- check-reqs.eclass 19 Oct 2012 03:35:15 -0000 1.13 |
| 21 |
+++ check-reqs.eclass 28 Mar 2014 15:08:16 -0000 1.14 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
-# Copyright 1999-2012 Gentoo Foundation |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.13 2012/10/19 03:35:15 patrick Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.14 2014/03/28 15:08:16 ulm Exp $ |
| 28 |
|
| 29 |
# @ECLASS: check-reqs.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -155,7 +155,7 @@ |
| 32 |
# @FUNCTION: check-reqs_get_mebibytes |
| 33 |
# @DESCRIPTION: |
| 34 |
# Internal function that returns number in mebibytes. |
| 35 |
-# Converts from 1G=1024 or 1T=1048576 |
| 36 |
+# Returns 1024 for 1G or 1048576 for 1T. |
| 37 |
check-reqs_get_mebibytes() { |
| 38 |
debug-print-function ${FUNCNAME} "$@" |
| 39 |
|
| 40 |
@@ -176,8 +176,8 @@ |
| 41 |
|
| 42 |
# @FUNCTION: check-reqs_get_number |
| 43 |
# @DESCRIPTION: |
| 44 |
-# Internal function that returns number without the unit. |
| 45 |
-# Converts from 1G=1 or 150T=150. |
| 46 |
+# Internal function that returns the numerical value without the unit. |
| 47 |
+# Returns "1" for "1G" or "150" for "150T". |
| 48 |
check-reqs_get_number() { |
| 49 |
debug-print-function ${FUNCNAME} "$@" |
| 50 |
|
| 51 |
@@ -190,7 +190,7 @@ |
| 52 |
# Backcompat. |
| 53 |
if [[ ${size} == ${1} ]]; then |
| 54 |
ewarn "QA: Package does not specify unit for the size check" |
| 55 |
- ewarn "QA: Assuming megabytes." |
| 56 |
+ ewarn "QA: Assuming mebibytes." |
| 57 |
ewarn "QA: File bug against the package. It should specify the unit." |
| 58 |
fi |
| 59 |
|
| 60 |
@@ -199,8 +199,8 @@ |
| 61 |
|
| 62 |
# @FUNCTION: check-reqs_get_unit |
| 63 |
# @DESCRIPTION: |
| 64 |
-# Internal function that returns number without the unit. |
| 65 |
-# Converts from 1G=1 or 150T=150. |
| 66 |
+# Internal function that return the unit without the numerical value. |
| 67 |
+# Returns "GiB" for "1G" or "TiB" for "150T". |
| 68 |
check-reqs_get_unit() { |
| 69 |
debug-print-function ${FUNCNAME} "$@" |
| 70 |
|
| 71 |
@@ -209,9 +209,9 @@ |
| 72 |
local unit=${1:(-1)} |
| 73 |
|
| 74 |
case ${unit} in |
| 75 |
- G) echo "gigabytes" ;; |
| 76 |
- [M0-9]) echo "megabytes" ;; |
| 77 |
- T) echo "terabytes" ;; |
| 78 |
+ G) echo "GiB" ;; |
| 79 |
+ [M0-9]) echo "MiB" ;; |
| 80 |
+ T) echo "TiB" ;; |
| 81 |
*) |
| 82 |
die "${FUNCNAME}: Unknown unit: ${unit}" |
| 83 |
;; |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.1185 eclass/ChangeLog |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1185&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1185&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1184&r2=1.1185 |
| 92 |
|
| 93 |
Index: ChangeLog |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 96 |
retrieving revision 1.1184 |
| 97 |
retrieving revision 1.1185 |
| 98 |
diff -u -r1.1184 -r1.1185 |
| 99 |
--- ChangeLog 26 Mar 2014 13:12:39 -0000 1.1184 |
| 100 |
+++ ChangeLog 28 Mar 2014 15:08:16 -0000 1.1185 |
| 101 |
@@ -1,6 +1,11 @@ |
| 102 |
# ChangeLog for eclass directory |
| 103 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1184 2014/03/26 13:12:39 kensington Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1185 2014/03/28 15:08:16 ulm Exp $ |
| 106 |
+ |
| 107 |
+ 28 Mar 2014; Ulrich Müller <ulm@g.o> check-reqs.eclass: |
| 108 |
+ Output binary prefixes for units according to IEC 80000-13, as calculations |
| 109 |
+ are 1024 based. Fix documentation of check-reqs_get_unit function, and other |
| 110 |
+ minor fixes. |
| 111 |
|
| 112 |
26 Mar 2014; Michael Palimaka <kensington@g.o> cmake-utils.eclass: |
| 113 |
Fix typo in prefix block by Christoph Junghans <ottxor@g.o>. |
Archives