diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 8c2f77195..8ea591ce1 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -6990,7 +6990,6 @@ flatpak_dir_pull (FlatpakDir *self, g_autofree char *url = NULL; g_autoptr(GPtrArray) subdirs_arg = NULL; g_auto(GLnxLockFile) lock = { 0, }; - g_autofree char *name = NULL; g_autofree char *current_checksum = NULL; if (!flatpak_dir_ensure_repo (self, cancellable, error)) @@ -7125,15 +7124,7 @@ flatpak_dir_pull (FlatpakDir *self, ret = TRUE; - if (repo == self->repo) - name = flatpak_dir_get_name (self); - else - { - GFile *file = ostree_repo_get_path (repo); - name = g_file_get_path (file); - } - - (flatpak_dir_log) (self, __FILE__, __LINE__, __FUNCTION__, name, + (flatpak_dir_log) (self, __FILE__, __LINE__, __FUNCTION__, NULL, "pull", state->remote_name, ref, rev, current_checksum, NULL, "Pulled %s from %s", ref, state->remote_name); diff --git a/tests/test-history.sh b/tests/test-history.sh index 75a6ff5c2..a9a0c9a80 100755 --- a/tests/test-history.sh +++ b/tests/test-history.sh @@ -57,10 +57,7 @@ if ! ${FLATPAK} --installation=history-installation history --since="${HISTORY_S exit 1 fi -# Pulls are logged when system helper is compiled out as they do -# not go to the temp child repo anymore -if [ "${HAVE_SYSTEM_HELPER:-1}" = "0" ]; then - cat > expected-log << 'EOF' +cat > expected-log << 'EOF' add remote system (history-installation) test-repo pull org.test.Hello.Locale master system (history-installation) test-repo deploy install org.test.Hello.Locale master system (history-installation) test-repo @@ -77,20 +74,6 @@ uninstall org.test.Platform master system (history-installation) uninstall org.test.Hello.Locale master system (history-installation) remove remote system (history-installation) test-repo EOF -else - cat > expected-log << 'EOF' -add remote system (history-installation) test-repo -deploy install org.test.Hello.Locale master system (history-installation) test-repo -deploy install org.test.Platform master system (history-installation) test-repo -deploy install org.test.Hello master system (history-installation) test-repo -deploy update org.test.Hello.Locale master system (history-installation) test-repo -deploy update org.test.Hello master system (history-installation) test-repo -uninstall org.test.Hello master system (history-installation) -uninstall org.test.Platform master system (history-installation) -uninstall org.test.Hello.Locale master system (history-installation) -remove remote system (history-installation) test-repo -EOF -fi diff history-log expected-log >&2 @@ -101,10 +84,7 @@ if ! ${FLATPAK} --installation=history-installation history --since="${HISTORY_S exit 1 fi -# Pulls are logged when system helper is compiled out as they do -# not go to the temp child repo anymore -if [ "${HAVE_SYSTEM_HELPER:-1}" = "0" ]; then - cat > expected-log << 'EOF' +cat > expected-log << 'EOF' [ { "change" : "add remote", @@ -213,82 +193,6 @@ if [ "${HAVE_SYSTEM_HELPER:-1}" = "0" ]; then } ] EOF -else - cat > expected-log << 'EOF' -[ - { - "change" : "add remote", - "application" : "", - "branch" : "", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "deploy install", - "application" : "org.test.Hello.Locale", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "deploy install", - "application" : "org.test.Platform", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "deploy install", - "application" : "org.test.Hello", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "deploy update", - "application" : "org.test.Hello.Locale", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "deploy update", - "application" : "org.test.Hello", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "test-repo" - }, - { - "change" : "uninstall", - "application" : "org.test.Hello", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "" - }, - { - "change" : "uninstall", - "application" : "org.test.Platform", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "" - }, - { - "change" : "uninstall", - "application" : "org.test.Hello.Locale", - "branch" : "master", - "installation" : "system (history-installation)", - "remote" : "" - }, - { - "change" : "remove remote", - "application" : "", - "branch" : "", - "installation" : "system (history-installation)", - "remote" : "test-repo" - } -] -EOF -fi diff history-log expected-log >&2