Commit a1d1f46a authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix content info checking

parent fef8ae0c
......@@ -35,6 +35,10 @@ __alt_local_content_search()
check_alt_contents_index || init_alt_contents_index
update_repo_if_needed
if [ ! -s "$ALT_CONTENTS_INDEX_LIST" ] ; then
fatal "Have no local contents index. Check epm repo --help."
fi
local CI="$(cat $ALT_CONTENTS_INDEX_LIST)"
info "Searching for $1 ... "
......
......@@ -127,14 +127,11 @@ update_alt_contents_index()
# fix rsync URL firstly
#local RSYNCURL="$(echo "$URL" | sed -e "s|rsync://\(ftp.basealt.ru\|basealt.org\|altlinux.ru\)/pub/distributions/ALTLinux|rsync://\1/ALTLinux|")" #"
#rsync_alt_contents_index $RSYNCURL/base/contents_index $LOCALPATH/contents_index -z && __add_to_contents_index_list "$RSYNCURL" "$LOCALPATH/contents_index" && continue
mkdir -p "$LOCALPATH"
eget -O $LOCALPATH/contents_index $URL/base/contents_index && __add_to_contents_index_list "$RSYNCURL" "$LOCALPATH/contents_index" && continue
#mkdir -p "$LOCALPATH"
#eget -O $LOCALPATH/contents_index $URL/base/contents_index && __add_to_contents_index_list "$RSYNCURL" "$LOCALPATH/contents_index" && continue
__add_better_to_contents_index_list "(cached)" "$LOCALPATH/contents_index.gz" "$LOCALPATH/contents_index"
#__add_better_to_contents_index_list "(cached)" "$LOCALPATH/contents_index.gz" "$LOCALPATH/contents_index"
fi
done
if [ ! -s "$ALT_CONTENTS_INDEX_LIST" ] ; then
fatal "Have no local contents index. Check epm repo --help."
fi
}
......@@ -77,7 +77,7 @@ case $BASEDISTRNAME in
__save_available_packages
load_helper epm-sh-altlinux-contents-index
init_alt_contents_index
update_alt_contents_index
return $ret
;;
......
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