diff --git a/automaint b/automaint index b5f0509..73508e5 100755 --- a/automaint +++ b/automaint @@ -203,7 +203,8 @@ for p in ${allpkgs}; do for o in ${needportlist[*]}; do [ "$p" = "$o" ] && { needsport=1; break; } done - #[ "$needsport" -a ! "$PORT_REPOSITORY" ] && continue + #[ "$needsport" ] && continue + [ "$needsport" -a ! "$PORT_REPOSITORY" ] && continue for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p @@ -240,9 +241,9 @@ for p in ${allpkgs}; do continue fi update_type="minor" - elif [ $dotdiff -lt 0 ]; then - [ "$VERBOSE" ] && echo "$p: newer version has less dots than older ${#VER[*]} < ${#SVER[*]}; skipping." - continue + #elif [ $dotdiff -lt 0 ]; then + # [ "$VERBOSE" ] && echo "$p: newer version has less dots than older ${#VER[*]} < ${#SVER[*]}; skipping." + # continue #elif [ "$i" != "${#SVER[*]}" ]; then # # e.g. SVER=0.11 -> VER=1.0 # [ "$VERBOSE" ] && echo "$p: not a minor version update at position $i/${#SVER[*]}: ${SVER[i-1]} != ${VER[i-1]}; skipping." @@ -261,15 +262,18 @@ for p in ${allpkgs}; do # continue fi fi - if [ "$old_pkg_repository" == "$PORT_REPOSITORY" -o "$old_pkg_repository" == "$DEST_REPOSITORY" ]; then - echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $old_pkg_version-$old_pkg_release)" - if [ ! "$TESTMODE" ]; then - autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null - if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then - curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\ + #if [ ! "${needsport}" ]; then + if [ "$old_pkg_repository" == "$PORT_REPOSITORY" -o "$old_pkg_repository" == "$DEST_REPOSITORY" ]; then + echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $old_pkg_version-$old_pkg_release)" + if [ ! "$TESTMODE" ]; then + autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null + if [ $? -eq 0 -a "$WEBBUILD_URL" -a "$WEBBUILD_USER" ]; then + curl -s "$WEBBUILD_URL?REQUEST=message&USER=$WEBBUILD_USER&SECRET=${WEBBUILD_SECRET}&USER_EMAIL=$WEBBUILD_EMAIL&\ MESSAGE=`cgi_encodevar \"imported $p from $SOURCE_REPOSITORY to $PORT_REPOSITORY for porting\"`" >/dev/null + fi fi fi + #fi #elif [ "$old_pkg_repository" == "$DEST_REPOSITORY" ]; then # echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $old_pkg_version-$old_pkg_release; update type: $update_type)" # if [ ! "$TESTMODE" ]; then @@ -281,7 +285,7 @@ MESSAGE=`cgi_encodevar \"imported $p from $SOURCE_REPOSITORY to