Skip to Content.
Sympa Menu

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

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 (8811734fee5a7f4c7538edfcdd781f16e163e769)
  • Date: Tue, 1 Oct 2019 21:53:53 +0000

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

usr/sbin/gaze | 54
+++-------------------------------------------
usr/share/man/man1/gaze.1 | 7 -----
2 files changed, 5 insertions(+), 56 deletions(-)

New commits:
commit 8811734fee5a7f4c7538edfcdd781f16e163e769
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gaze import: Remove old-style snapshot support

diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index e980b5c..7e9c787 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -64,9 +64,8 @@ export
Makes snapshot of box's configuration:
This includes the list of installed spells,
their dependencies and configure options.
-import [--deprecated] snapshot
- Restores snapshot. --deprecated activates
- the old behaviour, useful for old caches.
+import snapshot
+ Restores snapshot.

section [section] Lists all sections. Or all spells in
the specified section.
@@ -155,51 +154,6 @@ maybe_column() {
}

#-----
-## THIS FUNCTION IS DEPRECATED
-## To make the <@function export_snapshot> actualy be useful, an import
-## is quite handy.
-## @param snapshot file
-#-----
-import_snapshot_old() {
- message "${PROBLEM_COLOR}This behaviour is deprecated and can be removed
at any time!$DEFAULT_COLOR"
-
- SNAPSHOT=$1
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/snapshot
-
- if [ -f "$1" ]; then
-
- cd $BUILD_DIRECTORY
- mk_source_dir $SOURCE_DIRECTORY
-
- if [ -n "$EXTENSION" ]; then
- $COMPRESSBIN -dc $SNAPSHOT | tar -x
- else
- tar -xf $SNAPSHOT
- fi
-
- cd $SOURCE_DIRECTORY
-
- for LINE in $(cat install); do
- push_install_queue $LINE
- done
- report $INSTALL_QUEUE "Install Queue"
-
- cp -ai local /etc/sorcery
- cp -ai etc /
-
- cd /
- rm_source_dir $SOURCE_DIRECTORY
-
- else
-
- message "Unable to find snapshot \"$SNAPSHOT\""
- false
-
- fi
-
-}
-
-#-----
## Construct and echo a filename to save a snapshot in.
#-----
mk_snapshot_filename() {
@@ -251,8 +205,8 @@ import_snapshot() {
fi

if [[ $1 == '--deprecated' ]] ; then
- import_snapshot_old "$2"
- return
+ message "${PROBLEM_COLOR}--deprecated is not supported
anymore!$DEFAULT_COLOR"
+ shift
fi

local snapshot=$1
diff --git a/usr/share/man/man1/gaze.1 b/usr/share/man/man1/gaze.1
index 8678434..b5171ff 100644
--- a/usr/share/man/man1/gaze.1
+++ b/usr/share/man/man1/gaze.1
@@ -154,16 +154,11 @@ specified, of all the spells. In addition, this will
print the largest spell.
.IP
take a snapshot of all currently installed spells and their configuration.
.PP
-.SS import [--deprecated] <snapshot>
+.SS import <snapshot>
.IP
restore the snapshot from a previous
.I gaze export
command (see above)
-
-If --deprecated is specified, the old behaviour is activated and an old cache
-is expected. There is no significant problem if an old cache is restored with
-the new importer. A few files will be ignored - only the files that the new
-exporter saves are considered - and the queuing logic wille be slighty more
agressive.
.PP
.SS grimoire <grimoire>
.IP



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (8811734fee5a7f4c7538edfcdd781f16e163e769), Ismael Luceno, 10/01/2019

Archive powered by MHonArc 2.6.24.

Top of Page