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

Fixes for misc dbus methods#873

Closed
baude wants to merge 2 commits intoprojectatomic:masterfrom
baude:dbus_run
Closed

Fixes for misc dbus methods#873
baude wants to merge 2 commits intoprojectatomic:masterfrom
baude:dbus_run

Conversation

@baude
Copy link
Member

@baude baude commented Feb 6, 2017

Ensuring that dbuss run, diff, and containerdelete all work.

Atomic/diff.py Outdated
try:
image_list.append(DiffObj(image, args))
except mount.SelectionMatchError as e:
print(e)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

debugging message?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, fixed

atomic_dbus.py Outdated
args = self.Args()
args.container = containers[0]
args.containers = containers[1:]
print(type(containers))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debugging?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup fixed

if not isinstance(command, (list, tuple)):
command = [ command ]
return self.dbus_object.Run(image, name, spc, detach, command, dbus_interface="org.atomic", timeout = 2147400)
return self.dbus_object.Run(image, name, spc, detach, command, dbus_interface="org.atomic", timeout = 2147400)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bogus space?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup fixed.

@rhatdan
Copy link
Member

rhatdan commented Feb 7, 2017

@baude Tests are failing with an undefined e?

@rh-atomic-bot
Copy link

☔ The latest upstream changes (presumably 2ebeb1d) made this pull request unmergeable. Please resolve the merge conflicts.

@rhatdan
Copy link
Member

rhatdan commented Feb 8, 2017

Needs a rebase.

@cgwalters
Copy link
Member

bot, retest this please

@baude
Copy link
Member Author

baude commented Feb 12, 2017

@rh-atomic-bot +877ff09d

@rhatdan
Copy link
Member

rhatdan commented Feb 12, 2017

@rh-atomic-bot r=rhatdan 877ff09d

@rh-atomic-bot
Copy link

🙀 877ff09d is not a valid commit SHA. Please try again with 87ff09d.

@rhatdan
Copy link
Member

rhatdan commented Feb 12, 2017

@rh-atomic-bot r=rhatdan 87ff09d

@rh-atomic-bot
Copy link

⌛ Testing commit 87ff09d with merge 71735cb...

rh-atomic-bot pushed a commit that referenced this pull request Feb 12, 2017
Closes: #873
Approved by: rhatdan
@rh-atomic-bot
Copy link

☀️ Test successful - status-redhatci
Approved by: rhatdan
Pushing 71735cb to master...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants