summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-10-28 12:33:22 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-11-18 19:09:20 +0000
commit8c10dde7999441bf75bfe13ca41fbc261647b390 (patch)
tree58a54e4801a55624ce1af01a6c999e3dd6b6de6c
parentUpdating. (diff)
downloadpackages-8c10dde7999441bf75bfe13ca41fbc261647b390.tar.xz
packages-8c10dde7999441bf75bfe13ca41fbc261647b390.zip
Updating.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--ignore.txt8
-rwxr-xr-xupdate35
2 files changed, 28 insertions, 15 deletions
diff --git a/ignore.txt b/ignore.txt
index deb234d..043810b 100644
--- a/ignore.txt
+++ b/ignore.txt
@@ -1,10 +1,14 @@
# progress-linux
cryptsetup 2:2.3.4-1+exp1
e2fsprogs 1.46~WIP.2019.10.03-1
-icu 68.1~rc-1
+icu 68.1-1
libgit2 1.0.1+dfsg.1-1
-libreoffice 1:7.0.3~rc1-1
+libreoffice 1:7.1.0~alpha1-1
openssl 3.0.0~~alpha4-1
+# obsolete
+llvm-toolchain-8 1:8.0.1-10~progress5+u1
+tty-server 0.0~git20201105.50b9367+ds-1~progress5+u1
+
# bfh
octave 6.0.90-1
diff --git a/update b/update
index d83badc..ad97a69 100755
--- a/update
+++ b/update
@@ -2,6 +2,13 @@
set -e
+RED="\033[1;33;31m"
+GREEN="\033[1;33;32m"
+YELLOW="\033[1;33;33m"
+BLUE="\033[1;33;34m"
+WHITE="\033[1;33;37m"
+NORMAL="\033[0m"
+
# FIXME: getopt
# FIXME: -f for forced indices download
@@ -16,7 +23,7 @@ case "${MODE}" in
;;
engywuck-backports)
- UPSTREAM_DISTRIBUTIONS="sid experimental"
+ UPSTREAM_DISTRIBUTIONS="sid"
DOWNSTREAM_DISTRIBUTION="engywuck-backports"
DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
DOWNSTREAM_TAG="progress"
@@ -24,7 +31,7 @@ case "${MODE}" in
fuchur)
#UPSTREAM_DISTRIBUTIONS="bullseye bullseye-updates bullseye-proposed-updates"
- UPSTREAM_DISTRIBUTIONS="sid"
+ UPSTREAM_DISTRIBUTIONS="sid experimental"
DOWNSTREAM_DISTRIBUTION="fuchur"
DOWNSTREAM_MIRROR="https://apt.progress-linux.org/packages"
DOWNSTREAM_TAG="progress"
@@ -111,11 +118,6 @@ Download_upstream_sources ()
fi
}
-Debug ()
-{
- echo "${PACKAGE} ${UPSTREAM_VERSION} | ${DOWNSTREAM} [${DOWNSTREAM_VERSION}]"
-}
-
Download_downstream_sources
Download_upstream_sources
@@ -147,22 +149,29 @@ do
continue
fi
+ if [ -z "${UPSTREAM_VERSION}" ] && grep -qs "^${PACKAGE} ${DOWNSTREAM_VERSION}$" ignore.txt
+ then
+ continue
+ fi
+
+ if [ -z "${UPSTREAM_VERSION}" ]
+ then
+ echo "${BLUE}${PACKAGE}${NORMAL} '!${DOWNSTREAM_VERSION}'"
+ continue
+ fi
+
# comparing versions
if dpkg --compare-versions ${UPSTREAM_VERSION} eq ${DOWNSTREAM}
then
- #echo "${PACKAGE}: upstream = downstream"
echo -n "."
elif dpkg --compare-versions ${UPSTREAM_VERSION} gt ${DOWNSTREAM}
then
- echo "${PACKAGE}: upstream > downstream"
- Debug
+ echo "${RED}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} >> ${DOWNSTREAM_VERSION}'"
elif dpkg --compare-versions ${UPSTREAM_VERSION} lt ${DOWNSTREAM}
then
- echo "${PACKAGE}: upstream < downstream"
- Debug
+ echo "${YELLOW}${PACKAGE}${NORMAL} '${UPSTREAM_VERSION} << ${DOWNSTREAM_VERSION}'"
else
echo "${PACKAGE}: internal error"
- Debug
fi
done