Skip to Content.
Sympa Menu

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

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 (b892796924d640a91c3557a15fabf2e08b88a186)
  • Date: Mon, 4 Feb 2008 12:44:12 -0600

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

ChangeLog | 2 ++
usr/sbin/confmeld | 1 +
usr/share/man/man8/confmeld.8 | 41
++++++++++++++++++++++++++++++++++++++---
3 files changed, 41 insertions(+), 3 deletions(-)

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

confmeld: add --help to --help
* confmeld.8: mention all the cool new features

diff --git a/ChangeLog b/ChangeLog
index 8476964..567677d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
* config, libressurect: added a variable to hold the default answer
for
the config merge query
* confmeld: added support for forcing merges, last part of #13618
+ add --help to --help
+ * confmeld.8: mention all the cool new features

2008-02-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libunpack: return 1 when no algorithm is allowed
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index da80256..88dc445 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -20,6 +20,7 @@ confmeld nano
confmeld /etc/sysconfig/facilities

Optional Parameters:
+-h, --help will just print this help
-l, --list will just list all the spells and their staged configs
-c, --list-configs will just list all the staged configs
-s, --list-spells will just list all the spells with staged configs
diff --git a/usr/share/man/man8/confmeld.8 b/usr/share/man/man8/confmeld.8
index 630f0ca..58f256f 100644
--- a/usr/share/man/man8/confmeld.8
+++ b/usr/share/man/man8/confmeld.8
@@ -1,19 +1,31 @@
-.TH SUMMON 8 "November 2007" "Source Mage GNU Linux" "System Administration"
+.TH SUMMON 8 "February 2008" "Source Mage GNU Linux" "System Administration"
.SH NAME
confmeld \- merges staged configuration files into the system
.SH SYNOPSIS
.B confmeld
-[options]
+[options] [arguments] ...
+.PP
+.B confmeld
+[listing-options]
.SH "EXAMPLE"
To merge everything type:
.IP
.B confmeld
+.PP
+To list everything type:
+.IP
+.B confmeld -l
+.PP
+To bruteforce an update of nano and /etc/sysconfig/facilities type:
+.IP
+.B confmeld -f discard-old nano /etc/sysconfig/facilities
+.PP
.SH "DESCRIPTION"
.B confmeld
is part of the
.B sorcery
source-code package management suite. It is a command-line tool
-for the semiautomatical merging of staged configuration files. Spells will
not
+for the (semi)automatical merging of staged configuration files. Spells will
not
install newer versions during cast, but stage them in
.I /var/state/sorcery/staged_configs\fR.\fP

@@ -28,6 +40,29 @@ two files (an unified diff).
.SH "OPTIONS"
.SS "-h, --help"
outputs short help
+.SS "-l, --list"
+lists all the spells and their staged configs
+.SS "-c, --list-configs"
+lists all the staged configs
+.SS "-s, --list-spells"
+lists all the spells with staged configs
+.SS "-q, --no-column"
+turns off columnized output
+.SS "-f, --force" <action>
+always uses <action> when merging, where <action> can be one of:
+.TP
+.SS discard-new
+does nothing, just discards the new config
+.TP
+.SS discard-old
+trashes the old config and installs the new one in its place
+.TP
+.SS use-old
+leaves the old config in its place and backups the new one to
$old_config.$date.new
+.TP
+.SS use-new
+backups the old config to $old_config.$date.old and installs the new one in
its place
+.PP
.SH "AUTHOR"
Original version by Jaka Kranjc.
.PP



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b892796924d640a91c3557a15fabf2e08b88a186), Jaka Kranjc, 02/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page