Déjà Dup

Merge lp:~vej/deja-dup/fixes_gschema_xml_in into lp:deja-dup/34

  1. fixes_gschema_xml_in
  2. Merge into 34
Proposed by Vej
Status: Rejected
Rejected by: Vej
Proposed branch: lp:~vej/deja-dup/fixes_gschema_xml_in
Merge into: lp:deja-dup/34
Diff against target: 18 lines (+2/-2)
1 file modified
data/org.gnome.DejaDup.gschema.xml.in (+2/-2)
To merge this branch: bzr merge lp:~vej/deja-dup/fixes_gschema_xml_in
Reviewer Review Type Date Requested Status
Vej Disapprove
Michael Terry Pending
Review via email: mp+314770@code.launchpad.net

Description of the change

Updates the description of data/org.gnome.DejaDup.gschema.xml.in to include the variable $USER and state, that the other special variables are only replaced, when they are not part of larger paths.

To post a comment you must log in.
Revision history for this message
Vej (vej) wrote :

Abandoned because this had been superseded by https://code.launchpad.net/~nathanael-naeri/deja-dup/fix-1549776

review: Disapprove

Unmerged revisions

1571. By Vej

Partially fixes bug #1549776, by extending the description of the include and exclude list to match with the handling of the keys in DirHandling.vala.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/org.gnome.DejaDup.gschema.xml.in'
2--- data/org.gnome.DejaDup.gschema.xml.in 2016-12-15 18:33:08 +0000
3+++ data/org.gnome.DejaDup.gschema.xml.in 2017-01-14 18:45:01 +0000
4@@ -4,12 +4,12 @@
5 <key name="include-list" type="as">
6 <default>[ '$HOME' ]</default>
7 <_summary>Folders to save</_summary>
8- <_description>This list of directories will be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>
9+ <_description>This list of directories will be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories, if they are not part of a bigger path. $USER is replaced with the username. Relative entries are relative to the user’s home directory.</_description>
10 </key>
11 <key name="exclude-list" type="as">
12 <default>[ '$TRASH', '$DOWNLOAD' ]</default>
13 <_summary>Folders to ignore</_summary>
14- <_description>This list of directories will not be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories. Relative entries are relative to the user’s home directory.</_description>
15+ <_description>This list of directories will not be backed up. Reserved values $HOME, $DESKTOP, $DOCUMENTS, $DOWNLOAD, $MUSIC, $PICTURES, $PUBLIC_SHARE, $TEMPLATES, $TRASH, and $VIDEOS are recognized as the user’s special directories, if they are not part of a bigger path. $USER is replaced with the username. Relative entries are relative to the user’s home directory.</_description>
16 </key>
17 <key name="root-prompt" type="b">
18 <default>true</default>

Subscribers

People subscribed via source and target branches