Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

[merged] More cleanup for dbus interfaces #732

Closed
rhatdan wants to merge 1 commit into from
Closed

[merged] More cleanup for dbus interfaces #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Atomic/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@ def info(self):
buf = ""

def _no_label():
raise ValueError("'{}' has no label information."
.format(self.args.image))

return ""
if not self.args.storage:
if self.is_duplicate_image(self.image):
raise ValueError("Found more than one Image with name {}; "
Expand Down
1 change: 1 addition & 0 deletions atomic_dbus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def __init__(self):
self.optional = None
self.options = None
self.os = None
self.pretty = False
self.preview = False
self.prune = False
self.pubkeys = []
Expand Down
0 atomic_client.py → atomic_dbus_client.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export WORK_DIR=$(mktemp -p $(pwd) -d -t .tmp.XXXXXXXXXX)
export DOCKER=${DOCKER:-"/usr/bin/docker"}
export SECRET=`dd if=/dev/urandom bs=4096 count=1 2> /dev/null | sha256sum`
export ATOMIC_LIBEXEC="$(pwd)"
export ATOMIC_CLIENT="$(pwd)/atomic_client.py"
export ATOMIC_CLIENT="$(pwd)/atomic_dbus_client.py"

mkdir $WORK_DIR/ostree-repo
ostree --repo=$WORK_DIR/ostree-repo init --mode=bare-user
Expand Down