- documented status characters

diff --git a/doc/snapper.xml.in b/doc/snapper.xml.in
index ef99d16438c73fc833b28cc3a97139bcb54b35eb..c2f4e56960effd3fd276d9156ff907362287568c 100644 (file)
--- a/doc/snapper.xml.in
+++ b/doc/snapper.xml.in
@@ -422,6 +422,38 @@
              </listitem>
            </varlistentry>
          </variablelist>
+         <para>The output consists of a string encoding the status followed by
+         the filename. The characters of the status string are:</para>
+         <orderedlist>
+           <listitem>
+             <para>A "<computeroutput>+</computeroutput>" means the file was
+             created, a "<computeroutput>-</computeroutput>" means the file was deleted. A
+             "<computeroutput>c</computeroutput>" means the content of the file has changed
+             and a "<computeroutput>t</computeroutput>" means the type of the file has
+             changed (e.g. from regular file to directory).</para>
+           </listitem>
+           <listitem>
+             <para>A "<computeroutput>p</computeroutput>" means the permissions
+             are have changed.</para>
+           </listitem>
+           <listitem>
+             <para>An "<computeroutput>u</computeroutput>" means the user
+             ownership has changed.</para>
+           </listitem>
+           <listitem>
+             <para>A "<computeroutput>g</computeroutput>" means the group
+             ownership has changed.</para>
+           </listitem>
+           <listitem>
+             <para>A "<computeroutput>x</computeroutput>" means the extended
+             attribute information has changed.</para>
+           </listitem>
+           <listitem>
+             <para>An "<computeroutput>a</computeroutput>" means the ACL
+             information has changed.</para>
+           </listitem>
+         </orderedlist>
+         <para>If there is no change a "." is outputted.</para>
        </listitem>
       </varlistentry>
 
@@ -462,11 +494,9 @@
       <varlistentry>
        <term><option>xadiff <replaceable>number1</replaceable>..<replaceable>number2</replaceable> [files]</option></term>
        <listitem>
-
          <para>Compare the extended attributes between snapshot
          <replaceable>number1</replaceable> and
          <replaceable>number2</replaceable>. See examples below:</para>
-
          <itemizedlist>
            <listitem>
              <para><computeroutput> +:user.foo</computeroutput> for created attributes</para>

diff --git a/snapper/File.cc b/snapper/File.cc
index b328c73ded41b0d6a465b0bf8f6407338f6d0ecd..6da3f0da15f401379842362f0b128d2f822690ec 100644 (file)
--- a/snapper/File.cc
+++ b/snapper/File.cc
@@ -742,6 +742,9 @@ namespace snapper
     string
     statusToString(unsigned int status)
     {
+       // If possible keep the characters in sync with e.g. rpm or
+       // rsync. Unfortunately rpm and rsync are not consistent.
+
        string ret;
 
        if (status & CREATED)
@@ -789,7 +792,7 @@ namespace snapper
 
        if (str.length() >= 3)
        {
-           if (str[2] == 'u' || str[2] == 'o')
+           if (str[2] == 'u')
                ret |= OWNER;
        }