diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-02-25 15:55:44 +0100 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-02-25 15:55:44 +0100 |
commit | c00b15ff52f89ada9770453580e5828fd466e9c5 (patch) | |
tree | e17de93d9efda6ae58616b2debf9dce819919793 /src/cli | |
parent | 2951be08071ebe14b69e2da92a67e7d0a844e89a (diff) | |
download | abrt-c00b15ff52f89ada9770453580e5828fd466e9c5.tar.gz abrt-c00b15ff52f89ada9770453580e5828fd466e9c5.tar.xz abrt-c00b15ff52f89ada9770453580e5828fd466e9c5.zip |
change stealing semantics from copy to move
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/cli')
-rw-r--r-- | src/cli/CLI.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp index b0d6bdf6..593ed6ee 100644 --- a/src/cli/CLI.cpp +++ b/src/cli/CLI.cpp @@ -395,6 +395,7 @@ int main(int argc, char** argv) struct dump_dir *dd_copy = steal_directory((char *)D_list->data, dump_dir_name); if (dd_copy) { + delete_dump_dir_possibly_using_abrtd(dump_dir_name); dump_dir_name = xstrdup(dd_copy->dd_dir); dd_close(dd_copy); } @@ -407,21 +408,7 @@ int main(int argc, char** argv) } case OPT_DELETE: { - /* Try to delete it ourselves */ - struct dump_dir *dd = dd_opendir(dump_dir_name, DD_OPEN_READONLY); - if (dd) - { - if (dd->locked) /* it is not readonly */ - { - dd_delete(dd); - break; - } - dd_close(dd); - } - - /* Ask abrtd to do it for us */ - exitcode = connect_to_abrtd_and_call_DeleteDebugDump(dump_dir_name); - + exitcode = delete_dump_dir_possibly_using_abrtd(dump_dir_name); break; } case OPT_INFO: |