diff options
| author | David Zeuthen <davidz@redhat.com> | 2010-10-05 10:51:05 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2010-10-05 10:51:05 -0400 |
| commit | 9a6cf5e2f415ddd0d61d380032e34f9cb96e3b1a (patch) | |
| tree | f2baed602f8d46d0d76ff3efd8f7258a38c192f1 | |
| parent | 3d3229a8933dcbe5eb5ef42e6b51138701ad341c (diff) | |
Use proper sort order
Signed-off-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | stc/stcmonitor.c | 3 | ||||
| -rw-r--r-- | stc/test.c | 6 | ||||
| -rw-r--r-- | stc/testdata/semi_valid_conf/stc.conf | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/stc/stcmonitor.c b/stc/stcmonitor.c index 9620a76..ec6b020 100644 --- a/stc/stcmonitor.c +++ b/stc/stcmonitor.c @@ -780,7 +780,8 @@ stc_monitor_load_one_file (StcMonitor *monitor, goto process_next_item; } - sort_key = g_strdup_printf ("%s:%s", path, item_id); + /* Use <filename>:<group_number> as sort key to maintain same ordering */ + sort_key = g_strdup_printf ("%s:%d", path, n); item = _stc_item_new (item_type, item_id, target, @@ -189,7 +189,7 @@ test_stc_semi_valid_conf (void) SRCDIR "/testdata/semi_valid_conf/stc.conf: Element 0 of Options, `foo', for item foo of type MDRaid is malformed (no equal sign found). (stc-error-quark, 1)\n" SRCDIR "/testdata/semi_valid_conf/stc.conf: MDRaid item bar has unsupported target type (UUID and Name is supported). (stc-error-quark, 0)\n" SRCDIR "/testdata/semi_valid_conf/stc.conf.d/91.conf: Encountered item with duplicate id `multiple_instances_same_id'. Ignoring previous items. (stc-error-quark, 2)\n" - SRCDIR "/testdata/semi_valid_conf/stc.conf: Item ZItemWithUnresolved has unresolved dependency NonExisting. (stc-error-quark, 3)\n" + SRCDIR "/testdata/semi_valid_conf/stc.conf: Item ItemWithUnresolved has unresolved dependency NonExisting. (stc-error-quark, 3)\n" ); str2 = g_string_new (NULL); @@ -257,14 +257,14 @@ test_stc_semi_valid_conf (void) "options LUKS:password -> `xyz123'\n" "dependencies (none)\n" "\n" - "id `ZItemWithUnresolved'\n" + "id `ItemWithUnresolved'\n" "target `Device=/dev/sda'\n" "nick-name `(none)'\n" "type filesystem\n" "options Filesystem:mount_path -> `/mnt/Z'\n" "dependencies NonExisting\n" "\n" - "id `ZOtherRaid'\n" + "id `OtherRaid'\n" "target `Name=homehost:array_name'\n" "nick-name `Other RAID'\n" "type md-raid\n" diff --git a/stc/testdata/semi_valid_conf/stc.conf b/stc/testdata/semi_valid_conf/stc.conf index 1a5c071..ca7cacd 100644 --- a/stc/testdata/semi_valid_conf/stc.conf +++ b/stc/testdata/semi_valid_conf/stc.conf @@ -23,12 +23,12 @@ NickName=My Secret Stuff (Encrypted) Device=/dev/disk/by-uuid/12345 Options=LUKS:password=xyz123 -[Filesystem ZItemWithUnresolved] +[Filesystem ItemWithUnresolved] Device=/dev/sda Options=Filesystem:mount_path=/mnt/Z Depends=NonExisting -[MDRaid ZOtherRaid] +[MDRaid OtherRaid] NickName=Other RAID Name=homehost:array_name |