Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Ismael Luceno (29bc055b6eaef2e118b67f77901ba9bc8494b4fe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (29bc055b6eaef2e118b67f77901ba9bc8494b4fe)
  • Date: Mon, 11 Feb 2019 23:41:12 +0000

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

var/lib/sorcery/modules/libdownload | 2 +-
var/lib/sorcery/modules/libgpg | 2 +-
var/lib/sorcery/modules/libmisc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 29bc055b6eaef2e118b67f77901ba9bc8494b4fe
Author: Pavel Vinogradov <vin.public AT gmail.com>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libdownload, libgpg, libmisc: Fix inverted checks

Bug introduced by commit b2680f032a798e51262ab66573c5222acda6c457.

[ismael AT sourcemage.org: commit message]

diff --git a/var/lib/sorcery/modules/libdownload
b/var/lib/sorcery/modules/libdownload
index 333d28f..0b1e4dd 100755
--- a/var/lib/sorcery/modules/libdownload
+++ b/var/lib/sorcery/modules/libdownload
@@ -93,7 +93,7 @@ dl_get_bucket() {
}

dl_command_check() {
- if type "$1" >/dev/null 2>&1; then
+ if ! type "$1" >/dev/null 2>&1; then
message "${PROBLEM_COLOR}${cmd:-$1} is not installed, please cast it..."
\
"${DEFAULT_COLOR}"
return 1
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 48cb3be..5434091 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -41,7 +41,7 @@ gpg_verify_signature() { # $1 sig $2 file $3 pubring $4
algo var
# always trust and supply our own keyring.
# We provide our own trust for the pubkey validity.

- if type gpg >/dev/null 2>&1; then
+ if ! type gpg >/dev/null 2>&1; then
message "It appears you do not have gpg (gnupg) in your PATH."
message "${QUERY_COLOR}For full source verification, it is highly" \
"suggested that you cast gnupg\nas soon as possible. This" \
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index bdd1fa7..4e93fda 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1346,7 +1346,7 @@ smgl_which() {
#---------------------------------------------------------------------
find_make() {
local ___REAL_MAKE
- if smgl_which make ___REAL_MAKE; then
+ if ! smgl_which make ___REAL_MAKE >/dev/null 2>&1; then
message "Cannot find make command!!"
message "Bailing out"
return 1



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (29bc055b6eaef2e118b67f77901ba9bc8494b4fe), Ismael Luceno, 02/11/2019

Archive powered by MHonArc 2.6.24.

Top of Page