The underlying problem could be addressed more directly in derive_orig_search_list_from_args(), where it is identifying the search list to use:
source = 'debian' if for_merge else 'ubuntu' orig_search_list = [ OrigSearchListEntry( mechanism=fetch_orig_from_parent_dir, source=None, must_build=True, ), OrigSearchListEntry( mechanism=fetch_orig_from_cache, source=source, must_build=False, ), ]
One thought might be to simply include both 'ubuntu' and 'debian' in this list, so that it falls back to debian if ubuntu doesn't work.
Alternatively, perhaps git-ubuntu could use the changelog version number to heuristically identify merges (i.e. if the version is *ubuntu1).
The underlying problem could be addressed more directly in derive_ orig_search_ list_from_ args(), where it is identifying the search list to use:
source = 'debian' if for_merge else 'ubuntu' search_ list = [
OrigSearchList Entry(
mechanism= fetch_orig_ from_parent_ dir,
source= None, build=True, Entry(
mechanism= fetch_orig_ from_cache,
source= source,
must_ build=False,
orig_
must_
),
OrigSearchList
),
]
One thought might be to simply include both 'ubuntu' and 'debian' in this list, so that it falls back to debian if ubuntu doesn't work.
Alternatively, perhaps git-ubuntu could use the changelog version number to heuristically identify merges (i.e. if the version is *ubuntu1).