Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check-passwd/groups options #21

Closed
wants to merge 2 commits into from
Closed

check-passwd/groups options #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dba6c3
treecompose: Add --check passwd/groups, needs latest rpm-ostree
james-antill Nov 21, 2014
a753865
treecompose: Don't traceback if rpm-ostree command fails
james-antill Nov 21, 2014
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
17 changes: 15 additions & 2 deletions src/py/rpmostreecompose/treecompose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
from .taskbase import TaskBase
from .utils import run_sync, fail_msg


def _rev2version(repo, rev):
_,oldrev = repo.resolve_rev(rev, True)
if oldrev is None:
Expand Down Expand Up @@ -136,7 +135,17 @@ def compose_tree(self):
os.makedirs(rpmostreecachedir)
rpmostreecmd.append(self.jsonfilename)

subprocess.check_call(rpmostreecmd)
if self.check_passwd:
rpmostreecmd.append('--check-passwd=' + self.check_passwd)

if self.check_groups:
rpmostreecmd.append('--check-groups=' + self.check_groups)

try:
subprocess.check_call(rpmostreecmd)
except subprocess.CalledProcessError:
return (origrev, origrev)

_,newrev = self.repo.resolve_rev(self.ref, True)
return (origrev, newrev)

Expand All @@ -147,10 +156,14 @@ def main(cmd):
parents=[TaskBase.baseargs()])
parser.add_argument('-p', '--profile', type=str, default='DEFAULT', help='Profile to compose (references a stanza in the config file)')
parser.add_argument('-V', '--versioning', type=str, default='skip-or-refresh', help='Version to mark compose')
parser.add_argument('--check-passwd', type=str, default=None, help='File/commit to check passwd file against')
parser.add_argument('--check-groups', type=str, default=None, help='File/commit to check group file against')
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
args = parser.parse_args()
composer = Treecompose(args, cmd, profile=args.profile)
composer.tree_version = args.versioning
composer.check_passwd = args.check_passwd
composer.check_groups = args.check_groups
composer.show_config()
origrev, newrev = composer.compose_tree()

Expand Down