autodist-repository: manage merging of packages without relying on base arch (i586)
This commit is contained in:
parent
112abc68c6
commit
99ab1fe252
@ -426,19 +426,29 @@ function import_package() {
|
|||||||
# check release in dest repository
|
# check release in dest repository
|
||||||
get_pkg_buildinfo $destrepository $a $import_pkg
|
get_pkg_buildinfo $destrepository $a $import_pkg
|
||||||
[ "$pkg_name" ] && {
|
[ "$pkg_name" ] && {
|
||||||
# IMPORT_ORIG_ARCHS=(${IMPORT_ORIG_ARCHS[*]} $a)
|
dest_ver=$pkg_version
|
||||||
|
dest_rel=$pkg_release
|
||||||
get_pkg_buildinfo $origrepository $a $import_pkg
|
get_pkg_buildinfo $origrepository $a $import_pkg
|
||||||
[ "$pkg_name" ] || {
|
[ "$pkg_name" ] || {
|
||||||
[ "$a" == "$basearch" ] && {
|
for b in ${AUTODIST_ARCHS[*]}; do
|
||||||
echo "Error: package $import_pkg does not exist in $origrepository($a); skipping."
|
if [ "$b" != "$a" ]; then
|
||||||
return
|
# Get upstream version in other architecture, then if same version -> merge
|
||||||
}
|
get_pkg_buildinfo $origrepository $b $import_pkg
|
||||||
if [ "$force" = "1" ]; then
|
fi
|
||||||
echo "Warning: package $import_pkg is missing in $origrepository($a) but present in $destrepository($a)."
|
[ "$pkg_name" ] && break
|
||||||
echo "Import forced. You will need to port package to the missing arch."
|
done
|
||||||
else
|
if [ "$dest_ver-$dest_rel" != "$pkg_version-$pkg_release" ]; then
|
||||||
echo "Error: package $import_pkg is missing in $origrepository($a). This would break package in $destrepository($a) repository."
|
[ "$a" == "$basearch" -a "$force" != "1" ] && {
|
||||||
return 255
|
echo "Error: package $import_pkg for $a does not exist in $origrepository and can't merge due to different versions; skipping."
|
||||||
|
return 255
|
||||||
|
}
|
||||||
|
if [ "$force" = "1" ]; then
|
||||||
|
echo "Warning: package $import_pkg for $a is missing in $origrepository but present in $destrepository."
|
||||||
|
echo "Import forced. You will need to port package to the missing arch."
|
||||||
|
else
|
||||||
|
echo "Error: package $import_pkg for $a is missing in $origrepository. This would break package in $destrepository($a) repository."
|
||||||
|
return 255
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user