Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Cachito: configure relative path if source is in subdirectory #562

Merged
merged 1 commit into from
Mar 1, 2022
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions doozerlib/distgit.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import pathlib
import re
import shutil
import time
import sys
import time
import traceback
from datetime import date
from multiprocessing import Event, Lock
from typing import List, Tuple, Type, Union, Optional, Dict
from typing import Dict, List, Optional, Tuple, Union

import aiofiles
import bashlex
Expand All @@ -26,14 +26,14 @@
stop_after_attempt, wait_fixed)

from doozerlib import assertion, constants, exectools, logutil, state, util
from doozerlib.assembly import AssemblyTypes
from doozerlib.brew import get_build_objects, watch_task
from doozerlib.dblib import Record
from doozerlib.exceptions import DoozerFatalError
from doozerlib.model import ListModel, Missing, Model
from doozerlib.pushd import Dir
from doozerlib.source_modifications import SourceModifierFactory
from doozerlib.util import convert_remote_git_to_https, yellow_print
from doozerlib.assembly import AssemblyTypes

# doozer used to be part of OIT
OIT_COMMENT_PREFIX = '#oit##'
Expand Down Expand Up @@ -534,6 +534,8 @@ def _generate_osbs_image_config(self, version: str) -> Dict:
}
if flags:
remote_source['flags'] = flags
if self.config.content.source.path is not Missing: # source is in subdirectory
remote_source['packages'] = {pkg_manager: [{"path": self.config.content.source.path}] for pkg_manager in pkg_managers}
config_overrides.update({
'remote_sources': [
{
Expand Down