Commit aabdfd9e authored by Vitaly Lipatov's avatar Vitaly Lipatov

add deferred binary repository support

parent 707d19a8
...@@ -87,6 +87,7 @@ test -z "$LISTNAMES" && fatal "file not found in '$@'" ...@@ -87,6 +87,7 @@ test -z "$LISTNAMES" && fatal "file not found in '$@'"
if [ "$PKGVENDOR" = "alt" ] ; then if [ "$PKGVENDOR" = "alt" ] ; then
MDISTR=$MENV MDISTR=$MENV
[ "$MDISTR" = "sisyphus" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)." [ "$MDISTR" = "sisyphus" ] && fatal "It makes no sense to backport to Sisyphus (You need to try with -b $EXAMPLEALTDISTRVERSION)."
[ "$MDISTR" = "deferred" ] && fatal "It makes no sense to backport to Deferred (You need to try with -b $EXAMPLEALTDISTRVERSION)."
# override by defined target version # override by defined target version
DISTRVERSION=$BINARYREPO DISTRVERSION=$BINARYREPO
else else
......
...@@ -42,7 +42,7 @@ phelp() ...@@ -42,7 +42,7 @@ phelp()
echog " -t make temporary commit before build (rpmbb like behavior)" echog " -t make temporary commit before build (rpmbb like behavior)"
echog " -l lazy cleanup (clean before build, not after)" echog " -l lazy cleanup (clean before build, not after)"
echog " -w use tar as immediate archive for myhsh" echog " -w use tar as immediate archive for myhsh"
echog " -b REPONAME binary repository name (p9, c8, sisyphus and so on)" echog " -b REPONAME binary repository name (p9, c8, sisyphus, deferred and so on)"
} }
PASSEDARGS= PASSEDARGS=
......
...@@ -19,7 +19,7 @@ set_target_type() ...@@ -19,7 +19,7 @@ set_target_type()
return 0 return 0
fi fi
case "$1" in case "$1" in
("DD" | "SS" | "EE" | "sisyphus") ("DD" | "SS" | "EE" | "sisyphus" | "deferred")
MENV="$1" MENV="$1"
return 0; return 0;
;; ;;
...@@ -109,7 +109,7 @@ pkg_release_check() ...@@ -109,7 +109,7 @@ pkg_release_check()
# can be set from korinf config # can be set from korinf config
[ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE [ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE
# FIXME! broken for release more than 9 # FIXME! broken for release more than 9
if [ "$MENV" = "sisyphus" ] ; then if [ "$MENV" = "sisyphus" ] || [ "$MENV" = "deferred" ] ; then
for i in $@ ; do for i in $@ ; do
if rhas "$i" "($STREL|$STRELDEF)[0-9]+\.M[0-9][0-9]\.[0-9]+" ; then if rhas "$i" "($STREL|$STRELDEF)[0-9]+\.M[0-9][0-9]\.[0-9]+" ; then
# Значит не тот релиз # Значит не тот релиз
......
...@@ -404,6 +404,7 @@ if [ "$PKGVENDOR" = "alt" ] && [ -n "$MENV" ] ; then ...@@ -404,6 +404,7 @@ if [ "$PKGVENDOR" = "alt" ] && [ -n "$MENV" ] ; then
#[ -n "$APTCONF" ] && fatal "Internal error: APTCONF already defined as $APTCONF for $MENV" #[ -n "$APTCONF" ] && fatal "Internal error: APTCONF already defined as $APTCONF for $MENV"
APTCONF=${APTCONFBASE/.sisyphus}.$MENV APTCONF=${APTCONFBASE/.sisyphus}.$MENV
[ "$MENV" = "sisyphus" ] && [ ! -r "$APTCONF" ] && APTCONF=${APTCONFBASE/.sisyphus} [ "$MENV" = "sisyphus" ] && [ ! -r "$APTCONF" ] && APTCONF=${APTCONFBASE/.sisyphus}
[ "$MENV" = "deferred" ] && APTCONF=${APTCONFBASE}.deferred
[ -n "$VERBOSE" ] && echog "Target ALT Linux system: `get_altdistr_version $MENV`, use \$APTCONF" [ -n "$VERBOSE" ] && echog "Target ALT Linux system: `get_altdistr_version $MENV`, use \$APTCONF"
MENVARG="-$MENV" MENVARG="-$MENV"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment