Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (84df1223884c3ed26212bca55ad0396032671473)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (84df1223884c3ed26212bca55ad0396032671473)
  • Date: Thu, 15 Sep 2011 08:08:33 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 1 +
var/lib/sorcery/modules/libmisc | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 84df1223884c3ed26212bca55ad0396032671473
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

use a fallback when an archspec vanishes #15838

diff --git a/ChangeLog b/ChangeLog
index fff871c..215ad36 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* libmisc: added xz and 7z support to display_file
merged show_file from cabal and sorcery
merged display_file into show_file
+ use a fallback when an archspec vanishes #15838
* libsecurity: use filename_indicates_compression
* libunpack: added xz, 7z and lzma support #13176
* libsorcery: added xz compression support #13176
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 896e55d..623c241 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1384,8 +1384,12 @@ function set_architecture() {
[ $SPECFILE ] && break
done
if [[ ! $SPECFILE ]] ; then
- message "${PROBLEM_COLOR}Cannot find arch spec for $arch!$DEFAULT_COLOR"
- return 1
+ message "${PROBLEM_COLOR}Cannot find arch spec for $arch!"
+ message "Reverting to null!"
+ message "Please run sorcery afterwards and pick another
architecture!$DEFAULT_COLOR"
+ echo
+ sleep 2
+ SPECFILE=$(find -L ${specdir} -perm -400 -type f -name "null" -print
-quit 2>/dev/null)
fi
debug "libmisc" "set_architecture: SPECFILE=$SPECFILE"




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (84df1223884c3ed26212bca55ad0396032671473), Jaka Kranjc, 09/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page