From e8e064555eee74b80aa96371cf35cb2cd18b9c1b Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 15 Aug 2013 12:07:45 -0400 Subject: Reverse arch and plat in feeds paths. --- (limited to 'lib') diff --git a/lib/index.sh b/lib/index.sh index 5b6cdb9..2bd6a0e 100644 --- a/lib/index.sh +++ b/lib/index.sh @@ -36,7 +36,7 @@ feed_add_package() pkg_hash="$(hash_name "${pkg}")" # Add package metadata to feed hash index. - feed_hash_idx="${opt_base_dir}/feeds/${chan}/${dist}/${plat}/${arch}" + feed_hash_idx="${opt_base_dir}/feeds/${chan}/${dist}/${arch}/${plat}" feed_hash_idx="${feed_hash_idx}/${sect}/.db/${pkg_hash}" mkdir -p "${feed_hash_idx}/info" tar -xzOf "${opt_base_dir}/${file}" 'control.tar.gz' | \ @@ -70,7 +70,7 @@ feed_remove_package() pkg_hash="$(hash_name "${pkg}")" # Remove package metadata from feed hash index. - feed_hash_idx="${opt_base_dir}/feeds/${chan}/${dist}/${plat}/${arch}" + feed_hash_idx="${opt_base_dir}/feeds/${chan}/${dist}/${arch}/${plat}" feed_hash_idx="${feed_hash_idx}/${sect}/.db/${pkg_hash}" rm -f "${feed_hash_idx}/info/${pkg}.control" try_rmdir "${feed_hash_idx}/info" @@ -118,7 +118,7 @@ update_feeds() plat="${plat##*/}" arch="${plat##*_}" plat="${plat%_*}" - archplat="${suite}/${plat}/${arch}" + archplat="${suite}/${arch}/${plat}" # For each section: for sect_dirent in "${archplat_dirent}/"*/; do if [ ! -d "${sect_dirent}" ]; then -- cgit v0.9.1