[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7ee109ab65a36e333a9da84fe3a7f6b9682ad335)

Jaka Kranjc scm at sourcemage.org
Wed Jun 18 08:34:01 EDT 2008


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

 ChangeLog                       |    2 ++
 usr/sbin/cast                   |    5 +----
 usr/sbin/summon                 |    5 -----
 usr/sbin/vcast                  |    2 --
 usr/share/man/man8/summon.8     |    5 -----
 var/lib/sorcery/modules/libapi  |    2 +-
 var/lib/sorcery/modules/libmisc |    2 +-
 7 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 7ee109ab65a36e333a9da84fe3a7f6b9682ad335
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    cast, summon, vcast, libapi, libmisc: removed --url remnants #14525
          If you want to download from a different location, use summon --raw

diff --git a/ChangeLog b/ChangeLog
index 847ff51..9ab9a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* libsorcery: increment the counter before drawing the progress bar
 	* libtablet: only hardlink files if they're not already hardlinked when
 	  coalescing the tablet
+	* cast, summon, vcast, libapi, libmisc: removed --url remnants #14525
+	  If you want to download from a different location, use summon --raw
 
 2008-06-17 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* sorcery_config.5: clarify what the internal_version is for
diff --git a/usr/sbin/cast b/usr/sbin/cast
index c677a1d..75a63ef 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -69,7 +69,6 @@ Optional Parameters:
 -b  |  --force-base-dep         Force all spells to depend on basesystem
 
        --from   directory       Specify an alternate for $SOURCE_CACHE
-       --url    URL             Specify an alternate download URL
 
        --queue                  Cast all spells listed in $INSTALL_QUEUE
 
@@ -83,7 +82,7 @@ EOF
 ## @Aguments Arguments of cast
 ## @Globals DEPS_ONLY RECONFIGURE COMPILE
 ## @Globals FORCE_DOWNLOAD SOURCE_CACHE SILENT SEPARATE
-## @Globals BASE_URL INSTALL_QUEUE
+## @Globals INSTALL_QUEUE
 ##
 #---------------------------------------------------------------------
 function process_parameters()  {
@@ -118,7 +117,6 @@ function process_parameters()  {
               --from)  export  SOURCE_CACHE=$2;                      shift 2  ;;
             --silent)  SILENT="$1";                                  shift 1  ;;
                   -s)  export  SEPARATE="$1";                        shift 1  ;;
-               --url)  export  BASE_URL="$2";                        shift 2  ;;
              --queue)  CAST_QUEUE=yes ; COMPILE=$1;                  shift 1  ;;
                    *)  help                                   ;;
       esac
@@ -166,7 +164,6 @@ function strip_parameters()  {
             -c|--compile)  shift 1  ;;
            -d|--download)  shift 1  ;;
                       -s)  shift 1  ;;
-                   --url)  shift 2  ;;
                  --queue)  shift 1  ;;
                        *)  shift 1  ;;
 
diff --git a/usr/sbin/summon b/usr/sbin/summon
index 6a08dbc..899ee8f 100755
--- a/usr/sbin/summon
+++ b/usr/sbin/summon
@@ -35,9 +35,6 @@ Optional Parameters:
 
 --from          <directory>     Specify an alternate for $SOURCE_CACHE
 
-
---url           <URL>           Specify an alternate download URL
-
 -d | --download                 Force download of source, regardless of
                                  of whether it exists locally or not.
 
@@ -86,7 +83,6 @@ fi
       case $1 in
          --from) SOURCE_CACHE=$2;         shift 2 ;;
          --help) help;                    exit  1 ;;
-          --url) BASE_URL="$2" ;          shift 2 ;;
   -d|--download) FORCE_DOWNLOAD=on;        shift 1 ;;
   -g|--grimoire) codex_set_grimoires $2;  shift 2 ;;
      -p|--print) set_print_type $2;       shift 2 ;;
@@ -113,7 +109,6 @@ strip_parameters()  {
       case  $1  in
         --from)  shift 2  ;;
         --help)  shift 1  ;;
-         --url)  shift 2  ;;
  -d|--download)  shift 1  ;;
  -g|--grimoire)  shift 2  ;;
     -p|--print)  shift 2  ;;
diff --git a/usr/sbin/vcast b/usr/sbin/vcast
index de0e05a..6fdd6d1 100755
--- a/usr/sbin/vcast
+++ b/usr/sbin/vcast
@@ -30,7 +30,6 @@ process_parameters()  {
       case  $1  in
 
                   --from)  export  SOURCE_CACHE="$2";       shift  2  ;;
-                   --url)  export  BASE_URL="$2";           shift  2  ;;
               -n|--nofix)  NO_SUMMON="$1";  NO_GAZE="$1";   shift  1  ;;
                 --silent)  NO_SUMMON="$1";  NO_GAZE="$1";   shift  1  ;;
                   --deps)  NO_SUMMON="$1";                  shift  1  ;;
@@ -57,7 +56,6 @@ strip_parameters()  {
 
       case  $1  in
         --from)  shift 2  ;;
-         --url)  shift 2  ;;
              *)  shift 1  ;;
       esac
 
diff --git a/usr/share/man/man8/summon.8 b/usr/share/man/man8/summon.8
index 2ec4a0f..620e190 100644
--- a/usr/share/man/man8/summon.8
+++ b/usr/share/man/man8/summon.8
@@ -28,11 +28,6 @@ directory, the directory the packages get downloaded to.
 (or actually moved to when the download finished)
 This may seem a strange name, but logical if you see that cast
 uses the same name for the same thing.
-.SS --url <url>
-This tries to download the specified spell from a different location.
-Specify only the directory, not the file.
-There are sorcery options to better handle this,
-this option is not recommended and may be removed in the future.
 .SS -d|--download
 This forces download even when the file already exists locally,
 instead of skipping it in that case.
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index be17e81..626de78 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -125,7 +125,7 @@
 # CAST_PASS download_log IW_LOG SOLO QUIET INSTALL_QUEUE
 # OVERRIDE_CFLAGS OVERRIDE_CXXFLAGS OVERRIDE_LDFLAGS NO_OPTIMIZATION_FLAGS
 # DOT_PROGRESS VOYEUR_OVERRIDE RECONFIGURE RECAST_DOWN COMPILE RECAST_UP
-# FORCE_DOWNLOAD SILENT FIX DEBUG SEPARATE BASE_URL
+# FORCE_DOWNLOAD SILENT FIX DEBUG SEPARATE
 # CAST_HASH BACK_CAST_HASH CANNOT_CAST_HASH uncommitted_hash NEW_DEPENDS
 # spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR
 # BUILD_API VOYEUR_STDOUT VOYEUR_STDERR C_LOG C_FIFO INST_LOG MD5_LOG
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 36d0b9b..f0b419a 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1280,7 +1280,7 @@ function is_sorcery_var() {
   CAST_PASS download_log IW_LOG OPTS SOLO QUIET INSTALL_QUEUE \
   OVERRIDE_CFLAGS OVERRIDE_CXXFLAGS OVERRIDE_LDFLAGS NO_OPTIMIZATION_FLAGS \
   DOT_PROGRESS VOYEUR_OVERRIDE RECONFIGURE RECAST_DOWN COMPILE RECAST_UP \
-  FORCE_DOWNLOAD SOURCE_CACHE SILENT FIX DEBUG SEPARATE BASE_URL \
+  FORCE_DOWNLOAD SOURCE_CACHE SILENT FIX DEBUG SEPARATE \
   CAST_HASH BACK_CAST_HASH CANNOT_CAST_HASH uncommitted_hash NEW_DEPENDS \
   spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR \
   SCRIPT_DIRECTORY SECTION_DIRECTORY GRIMOIRE SPELL_DIRECTORY SECTION \



More information about the SM-Commit mailing list