mirror of
https://github.com/kewlfft/ansible-aur.git
synced 2025-09-17 08:30:39 +03:00
Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
583c7597a9 | ||
![]() |
cbf843e1db | ||
![]() |
2a076dc6a0 | ||
![]() |
8d177a7550 | ||
![]() |
b469b5a641 | ||
![]() |
63d3056a82 | ||
![]() |
91c6d70184 | ||
![]() |
9b25b11cea | ||
![]() |
2c090a49a8 | ||
![]() |
07e5fe301f | ||
![]() |
49a077790e | ||
![]() |
87a15853fa | ||
![]() |
7285f5aaaa | ||
![]() |
cda508cfc0 |
@@ -97,16 +97,19 @@ This user can be created in an Ansible task with the following actions:
|
||||
|
||||
```yaml
|
||||
- name: Create the `aur_builder` user
|
||||
become: yes
|
||||
ansible.builtin.user:
|
||||
name: aur_builder
|
||||
create_home: yes
|
||||
group: wheel
|
||||
|
||||
- name: Allow the `aur_builder` user to run `sudo pacman` without a password
|
||||
become: yes
|
||||
ansible.builtin.lineinfile:
|
||||
path: /etc/sudoers.d/11-install-aur_builder
|
||||
line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
|
||||
create: yes
|
||||
mode: 0644
|
||||
validate: 'visudo -cf %s'
|
||||
```
|
||||
|
||||
|
@@ -65,4 +65,6 @@ issues: https://github.com/kewlfft/ansible-aur/issues
|
||||
# artifact. A pattern is matched from the relative path of the file or directory of the collection directory. This
|
||||
# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
|
||||
# and '.git' are always filtered
|
||||
build_ignore: []
|
||||
build_ignore:
|
||||
- .github
|
||||
- .gitignore
|
||||
|
@@ -138,18 +138,8 @@ def check_packages(module, packages):
|
||||
"""
|
||||
Inform the user what would change if the module were run
|
||||
"""
|
||||
would_be_changed = []
|
||||
diff = {
|
||||
'before': '',
|
||||
'after': '',
|
||||
}
|
||||
|
||||
for package in packages:
|
||||
installed = package_installed(module, package)
|
||||
if not installed:
|
||||
would_be_changed.append(package)
|
||||
if module._diff:
|
||||
diff['after'] += package + "\n"
|
||||
would_be_changed = [package for package in packages if not package_installed(module, package)]
|
||||
diff = {'before': '', 'after': '\n'.join(package for package in would_be_changed if module._diff)}
|
||||
|
||||
if would_be_changed:
|
||||
status = True
|
||||
@@ -231,11 +221,10 @@ def check_upgrade(module, use):
|
||||
Inform user how many packages would be upgraded
|
||||
"""
|
||||
rc, stdout, stderr = module.run_command([use, '-Qu'], check_rc=True)
|
||||
data = stdout.split('\n')
|
||||
data.remove('')
|
||||
num_packages = sum(1 for line in stdout.splitlines() if line.strip())
|
||||
module.exit_json(
|
||||
changed=len(data) > 0,
|
||||
msg="{} package(s) would be upgraded".format(len(data)),
|
||||
changed=num_packages > 0,
|
||||
msg=f"{num_packages} package(s) would be upgraded",
|
||||
helper=use,
|
||||
)
|
||||
|
||||
@@ -270,8 +259,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
|
||||
changed_iter = False
|
||||
|
||||
for package in packages:
|
||||
if state == 'present':
|
||||
if package_installed(module, package):
|
||||
if state == 'present' and package_installed(module, package):
|
||||
rc = 0
|
||||
continue
|
||||
if use == 'makepkg':
|
||||
@@ -283,7 +271,7 @@ def install_packages(module, packages, use, extra_args, state, skip_pgp_check, i
|
||||
command.append(package)
|
||||
rc, out, err = module.run_command(command, check_rc=True)
|
||||
|
||||
changed_iter = changed_iter or not (out == '' or '-- skipping' in out or 'nothing to do' in out.lower())
|
||||
changed_iter |= not (out == '' or 'up-to-date -- skipping' in out or 'nothing to do' in out.lower())
|
||||
|
||||
message = 'installed package(s)' if changed_iter else 'package(s) already installed'
|
||||
|
||||
|
Reference in New Issue
Block a user