[SM-Commit] BZR Change 28 to stage-root sorcery by David Brown <dmlb2000 at dmlb2004>

scm at mail.sourcemage.org scm at mail.sourcemage.org
Wed May 3 17:50:03 EDT 2006


------------------------------------------------------------
revno: 28
committer: David Brown <dmlb2000 at dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-05-03 14:45:22 -0700
message:
  integrated/merged from devel
    ------------------------------------------------------------
    merged: astitt at sourcemage.org-20060503162727-30bf6bdd952a0473
    committer: Andrew Stitt <astitt at sourcemage.org>
    branch nick: devel-hack2
    timestamp: Wed 2006-05-03 09:27:27 -0700
    message:
      fix bug 10528, install_config_files marks files as new or old
    ------------------------------------------------------------
    merged: astitt at sourcemage.org-20060503162222-f839f07c85be2b9b
    committer: Andrew Stitt <astitt at sourcemage.org>
    branch nick: devel-hack2
    timestamp: Wed 2006-05-03 09:22:22 -0700
    message:
      fix bug 10465, gaze grimoire selection

=== modified file 'ChangeLog'
--- ChangeLog	
+++ ChangeLog	
@@ -1,3 +1,8 @@
+2006-05-03 Andrew Stitt <astitt at sourcemage.org>
+	* gaze: fix bug 10465, gaze allows grimoire selection
+	* libresurrect: fix bug 10528, install_config_files marks files
+	  as new or old, patch from Jaka Kranjc.
+
 2006-05-01 Andrew Stitt <astitt at sourcemage.org>
 	* libdepends: fix search for default provider
 

=== modified file 'usr/sbin/gaze'
--- usr/sbin/gaze	
+++ usr/sbin/gaze	
@@ -1635,11 +1635,24 @@
   [[ $UID != 0 ]] && test "$NICE" -lt 0 && NICE=0
   renice $NICE -p $$ >/dev/null
 
-  if [ $1 == "-q" ]; then
-        shift;
-        GAZE_VERBOSE=0
-        PAGER=cat
-  fi
+  while [[ -n "$1" ]] && [[ ${1:0:1} == "-" ]] ; do 
+    case $1 in
+      -q) GAZE_VERBOSE=0
+          PAGER=cat
+          shift
+          ;;
+      -g) for grimoire in $2; do
+            if ! codex_find_grimoire $grimoire >/dev/null; then
+              message "${PROBLEM_COLOR}No such grimoire: " \
+                      "${DEFAULT_COLOR}$grimoire"
+              return 1
+            fi
+            codex_set_grimoires $2
+          done
+          shift 2
+          ;;
+    esac
+  done
 
 
   SPELL=$2

=== modified file 'usr/share/man/man1/gaze.1'
--- usr/share/man/man1/gaze.1	
+++ usr/share/man/man1/gaze.1	
@@ -5,7 +5,7 @@
 .SH SYNOPSIS
 .PP
 .B gaze
-[-q] <what> [<arguments>]
+[-q] [-g <grimoires>] <what> [<arguments>]
 .SH "DESCRIPTION"
 .I gaze
 is part of the sorcery source-based package management suite. It is a
@@ -22,6 +22,10 @@
 .IP
 disable human style output.
 .PP
+.SS -g <grimoires>
+.IP
+specify which grimoire(s) to look in. To pass more than one, encapsulate them in quotes.
+.PP
 .SS alien
 .IP
 find and display all files which are not currently tracked by the

=== modified file 'var/lib/sorcery/modules/libresurrect'
--- var/lib/sorcery/modules/libresurrect	
+++ var/lib/sorcery/modules/libresurrect	
@@ -515,8 +515,8 @@
   while [[ "$continue" == "yes" ]] ; do
     message "${QUERY_COLOR}"
     message "(0) trash $to and install over it"
-    message "(1) backup $to to $to.$savetime, install the new file in its place"
-    message "(2) leave $to in its place, copy the new file to $to.$savetime"
+    message "(1) backup $to to $to.$savetime.old, install the new file in its place"
+    message "(2) leave $to in its place, copy the new file to $to.$savetime.new"
     message "(3) do nothing"
     message "(4) see a diff between $to and the new file"
     # TODO: someday add an option to use an external merge tool
@@ -534,10 +534,10 @@
     case $number in
       0)  cp -pv "$from" "$to"
           break ;;
-      1)  cp -pv "$to" "$to.$savetime"
+      1)  cp -pv "$to" "$to.$savetime.old"
           cp -pv "$from" "$to"
           break ;;
-      2)  cp -pv "$from" "$to.$savetime"
+      2)  cp -pv "$from" "$to.$savetime.new"
           mark_file_modified "$to"
           # this is deliberatly not track_manual, if this is run from
           # FINAL the user might not have wanted the files tracked




More information about the SM-Commit mailing list