Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sclorg/container-common-scripts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e746a701ef8f428b2775ebbc56101554539afca9
Choose a base ref
...
head repository: sclorg/container-common-scripts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f1b33a34c353520f4a8fd1906b4f24b13d10d86
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 23, 2023

  1. Don't print the error message on multispec exit code 2

    For non-existing and not expected matrix combinations generator
    produced a loud message that looked like a genuine error.
    
    ```
    [ERROR] distgen failed: Command '['dg', '--multispec', 'specs/multispec.yml',
    '--template', 'src/Dockerfile.template', '--distro', 'centos-7-x86_64.yaml',
    '--multispec-selector', 'version=3.11', '--output', '3.11/Dockerfile.centos7']'
    returned non-zero exit status 2.
    ```
    
    For exit code 2 the message is now supressed.
    Related: sclorg/s2i-python-container#594
    befeleme authored and zmiklank committed Jun 23, 2023
    Copy the full SHA
    6f1b33a View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 generator.py
5 changes: 4 additions & 1 deletion generator.py
Original file line number Diff line number Diff line change
@@ -37,7 +37,10 @@ def run_distgen(
try:
check_output(cmd)
except CalledProcessError as e:
print("[ERROR] distgen failed:", e)
# Exit code 2 is a special code for non existing matrix combinations
# It's not an actual error, hence don't print out its error message
if e.returncode != 2:
print("[ERROR] distgen failed:", e)


def get_version_distro_mapping(