Commit 91d17830 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.62.9

parent 68145307
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
export EPMVERSION="3.62.8" export EPMVERSION="3.62.9"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -3127,6 +3127,12 @@ __download_pkg_urls() ...@@ -3127,6 +3127,12 @@ __download_pkg_urls()
mv -v "$tmppkg/$i" "$tmppkg/$si" mv -v "$tmppkg/$i" "$tmppkg/$si"
i="$si" i="$si"
fi fi
si="$(echo "$i" | sed -e 's|\?.*||g')"
if [ "$si" != "$i" ] ; then
info "Arg sign ? detected in the downloaded file '$i', removing args from filename ..."
mv -v "$tmppkg/$i" "$tmppkg/$si"
i="$si"
fi
[ -n "$pkg_files" ] && pkg_files="$pkg_files $tmppkg/$i" || pkg_files="$tmppkg/$i" [ -n "$pkg_files" ] && pkg_files="$pkg_files $tmppkg/$i" || pkg_files="$tmppkg/$i"
[ -n "$pkg_urls_downloaded" ] && pkg_urls_downloaded="$pkg_urls_downloaded $url" || pkg_urls_downloaded="$url" [ -n "$pkg_urls_downloaded" ] && pkg_urls_downloaded="$pkg_urls_downloaded $url" || pkg_urls_downloaded="$url"
done done
...@@ -7768,8 +7774,14 @@ __do_query_real_file() ...@@ -7768,8 +7774,14 @@ __do_query_real_file()
if [ -e "$1" ] ; then if [ -e "$1" ] ; then
TOFILE="$(__abs_filename "$1")" TOFILE="$(__abs_filename "$1")"
else else
TOFILE=$(print_command_path "$1" || echo "$1") TOFILE="$(print_command_path "$1" || echo "$1")"
if [ "$TOFILE" != "$1" ] ; then if [ "$TOFILE" != "$1" ] ; then
# work against usrmerge
local t="$(realpath "$(dirname "$TOFILE")")/$(basename "$TOFILE")" #"
if [ "$TOFILE" != "$t" ] ; then
#info " > $TOFILE is placed as $t"
TOFILE="$t"
fi
info " > $1 is placed as $TOFILE" info " > $1 is placed as $TOFILE"
fi fi
fi fi
...@@ -11380,12 +11392,17 @@ if len(sys.argv) < 2: ...@@ -11380,12 +11392,17 @@ if len(sys.argv) < 2:
pyproject = sys.argv[1] pyproject = sys.argv[1]
c = toml.load(pyproject) c = toml.load(pyproject)
n = c["tool"]["poetry"]["dependencies"] try:
for key, value in n.items(): n = c["tool"]["poetry"]["dependencies"]
if isinstance(value, dict): for key, value in n.items():
print('\n' + key + ' ' , value["version"]) if isinstance(value, dict):
else: print('\n' + key + ' ' , value["version"])
print('\n' + key + ' ' + value) else:
print('\n' + key + ' ' + value)
except:
n = c["project"]["dependencies"]
for t in n:
print('\n' + t)
EOF EOF
a= python3 $lt "$1" a= python3 $lt "$1"
} }
......
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.62.8" EPMVERSION="3.62.9"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
......
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