[Mintegration-commits] r33 - queue-manager/trunk

[feri at garage.maemo.org]

Author: feri
Date: 2007-11-15 15:10:36 +0200 (Thu, 15 Nov 2007)
New Revision: 33

Modified:
   queue-manager/trunk/queue-manager-lib
Log:
adding back feature to create separate dirs of each package; it was gone somehow from the previous version :(

Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2007-11-15 10:28:59 UTC (rev 32)
+++ queue-manager/trunk/queue-manager-lib	2007-11-15 13:10:36 UTC (rev 33)
@@ -663,8 +663,8 @@
                           local _dest_pkg="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/binary"
                           local _rel_dest_pkg="${PROJECT:+project/}$SUITE/$_dist/binary"
                         else
-                          local _dest_pkg="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/$_hash"
-                          local _rel_dest_pkg="${PROJECT:+project/}$SUITE/$_dist/$_hash"
+                          local _dest_pkg="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/$_hash/$_package"
+                          local _rel_dest_pkg="${PROJECT:+project/}$SUITE/$_dist/$_hash/$_package"
                         fi                                                
 			case $use_source_dir in
 			   #FIXME# Right now, we use source, but we need to revert the idea (that is, not use source dir)
@@ -678,13 +678,13 @@
   					  local _dest_src="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/source"
 					  local _rel_dest_src="${PROJECT:+project/}$SUITE/$_dist/source"
                                         else
-  					  local _dest_src="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/source/$_hash"
-					  local _rel_dest_src="${PROJECT:+project/}$SUITE/$_dist/source/$_hash"
+  					  local _dest_src="$POOL_DIR/${PROJECT:+project/}$SUITE/$_dist/source/$_hash/$_package"
+					  local _rel_dest_src="${PROJECT:+project/}$SUITE/$_dist/source/$_hash/$_package"
                                         fi
 					;;
 			esac
 			mkdir -p "$_dest_src" "$_dest_pkg"
-			echo "INSTALL"
+			echo "INSTALL: $_dest_src --- $_dest_pkg"
 			sed '1,/Files:/d' "$_changes_file" | sed '/BEGIN PGP SIGNATURE/,$d' \
 				| while read MD SIZE SECTION PRIORITY FILE; do
 				if [ -z "$FILE" ]; then