From 8624c19ace94e5e7cc8a7b26f6238dbc362422e6 Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 17 Sep 2019 17:52:15 +0200 Subject: [PATCH] Rename PODMAN_ADDRESS to PODMAN_SYSTEM_ADDRESS We want to introduce user address as well so lets distinguish it. --- src/ImageSearchModal.jsx | 2 +- src/util.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ImageSearchModal.jsx b/src/ImageSearchModal.jsx index 5a3898bce..bc7b70c7a 100644 --- a/src/ImageSearchModal.jsx +++ b/src/ImageSearchModal.jsx @@ -63,7 +63,7 @@ export class ImageSearchModal extends React.Component { this.setState({ searchInProgress: true }); - varlink.connect(utils.PODMAN_ADDRESS) + varlink.connect(utils.PODMAN_SYSTEM_ADDRESS) .then(connection => { this.activeConnection = connection; diff --git a/src/util.js b/src/util.js index 1f101aa37..3790e37c8 100644 --- a/src/util.js +++ b/src/util.js @@ -3,7 +3,7 @@ import varlink from './varlink.js'; const _ = cockpit.gettext; -export const PODMAN_ADDRESS = "unix:/run/podman/io.podman"; +export const PODMAN_SYSTEM_ADDRESS = "unix:/run/podman/io.podman"; /* * Podman returns dates in the format that golang's time.String() exports. Use @@ -59,11 +59,11 @@ function handleVarlinkCallError(ex) { } export function podmanCall(name, args) { - return varlink.call(PODMAN_ADDRESS, "io.podman." + name, args); + return varlink.call(PODMAN_SYSTEM_ADDRESS, "io.podman." + name, args); } export function monitor(name, args, callback, on_close) { - return varlink.connect(PODMAN_ADDRESS) + return varlink.connect(PODMAN_SYSTEM_ADDRESS) .then(connection => { return connection.monitor("io.podman." + name, args, callback) }) .catch(e => { if (e.error === "ConnectionClosed")