diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-09 16:39:38 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-09 16:39:38 -0300 |
commit | f21fd2185aaef0b2e9054c5eb0d4369597bcc0ff (patch) | |
tree | 04186d02d49af629a61c57dc916be885a335c693 /librestage | |
parent | 1bbc75a678a69a27e18f09a9ab38d27545f013a2 (diff) | |
parent | 6d20859e305d5998358ee61d93741600fafd0b4e (diff) |
Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools
Conflicts:
libremakepkg
Diffstat (limited to 'librestage')
-rwxr-xr-x | librestage | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -77,7 +77,9 @@ staged='n' for _arch in ${ARCHES[@]}; do for pkg in ${pkgname[@]}; do - pkgpath=$(find ${PKGDEST}/ -type f -name "${pkg}-${pkgver}-${pkgrel}-${_arch}${PKGEXT}") + pkgpath=$(find ${PKGDEST}/ -type f \ + -name "${pkg}-${pkgver}-${pkgrel}-${_arch}${PKGEXT}" -or \ + -name "${pkg}-${epoch}:${pkgver}-${pkgrel}-${_arch}${PKGEXT}") [[ -z ${pkgpath} ]] && continue |