summaryrefslogtreecommitdiff
path: root/src/toru
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-02 15:12:59 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:01:06 -0600
commit12da94c924cb29dd83c4bbf6fd50d1d1fc660312 (patch)
tree11d72d386908df40bce89265403f9ad249da0230 /src/toru
parent24073402dd3d4324f117f12abc3c921cc3dc3750 (diff)
use common.sh:get_full_version() universally
Diffstat (limited to 'src/toru')
-rwxr-xr-xsrc/toru/toru15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/toru/toru b/src/toru/toru
index 5faa2f4..9930661 100755
--- a/src/toru/toru
+++ b/src/toru/toru
@@ -35,19 +35,6 @@ read_cache() {
return $?
}
-##
-# usage : get_full_version( $epoch, $pkgver, $pkgrel )
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-##
-get_full_version() {
- if [[ $1 -eq 0 ]]; then
- # zero epoch case, don't include it in version
- echo $2-$3
- else
- echo $1:$2-$3
- fi
-}
-
# Outputs an ordered package-fullpkgver array
print_package_array() {
echo "$@" | tr " " "\n" | sort -u
@@ -167,7 +154,7 @@ update() {
# Keep removing unneeded stuff
unset package_${_pkg} >/dev/null 2>&1 || true
# Fill the list of packages to find
- packages_in_abs+=($_pkg-$(get_full_version ${epoch:-0} $pkgver $pkgrel))
+ packages_in_abs+=($_pkg-$(get_full_version $_pkg)
package_paths+=($_pkg:$_pkgpath)
done # end pkgnames