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

[feri at garage.maemo.org]

Author: feri
Date: 2007-11-23 12:31:20 +0200 (Fri, 23 Nov 2007)
New Revision: 35

Modified:
   queue-manager/trunk/queue-manager-lib
Log:
Added chinook install file format


Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2007-11-20 08:40:42 UTC (rev 34)
+++ queue-manager/trunk/queue-manager-lib	2007-11-23 10:31:20 UTC (rev 35)
@@ -586,7 +586,6 @@
 	return 0
 }
 
-
 files_installed_from_dsc()
 {
   local _ret=1
@@ -638,8 +637,9 @@
 
 	local _reponame=$3
 	local _repodeb=$4
-        local _flat=$5	
-        case "$_package" in
+	local _flat=$5
+	
+	case "$_package" in
 		lib*)
 			_hash="`echo "$_package" | cut -b1-4`"
 			;;
@@ -696,10 +696,8 @@
 						log "info" " $FILE -> $_rel_dest_src"
 						;;
 					*.dsc)
-                                                #if files_installed_from_dsc "$FILE" "$_dest_src" ; then
-                                                  install -m 644 "$FILE" "$_dest_src" || exit 1
-                                                  log "info" " $FILE -> $_rel_dest_src"
-                                                #i 
+						install -m 644 "$FILE" "$_dest_src" || exit 1
+						log "info" " $FILE -> $_rel_dest_src"
 						;;
 					*)
 						install -m 644 "$FILE" "$_dest_pkg" || exit 1
@@ -930,10 +928,14 @@
 			echo "done"
 			if [ -f $_APT_DIR/$_APT_CONF ]; then
     		    ### FIXME ### we get a segmentation fault creating Contents for all
+echo "debug: fun starts here"
+echo "debug: $_APT_DIR/$_APT_CONF"
 				if LD_ASSUME_KERNEL=2.4.5 apt-ftparchive generate $_APT_DIR/$_APT_CONF ; then
 					:
+echo "debug: no way it gets here"
 				else
 					LD_ASSUME_KERNEL=2.4.5 apt-ftparchive generate $_APT_DIR/$_APT_CONF
+echo "debug: but maybe it gets here?"
 				fi
 			else
 				log "warning" "The needed apt.conf file ($_APT_DIR/$_APT_CONF) was not found"
@@ -1315,23 +1317,35 @@
 package   = $PACKAGE
 EOF
                             ;;
-                          "all")
+                          "chinook")
                              cat > $INSTALL_DIR/$PACKAGE.install << EOF
 [install]
-repo_name = $REPONAME
-repo_deb = $DEBLINE
-repo_deb_3  = $DEBLINE
+catalogues = extras
 package   = $PACKAGE
+
+[extras]
+name = maemo Extras
+uri = http://repository.maemo.org/extras/
+components = free non-free
 EOF
                             ;;
-						  "*")
+                          "all")
                              cat > $INSTALL_DIR/$PACKAGE.install << EOF
 [install]
 repo_name = $REPONAME
 repo_deb = $DEBLINE
 repo_deb_3  = $DEBLINE
 package   = $PACKAGE
+catalogues = extras
+
+[extras]
+name = maemo Extras
+uri = http://repository.maemo.org/extras/
+components = free non-free
 EOF
+                            ;;
+			  *)
+			    log "info" "I do not know the install file format for $RELEASE. Skipping install file generation"
                              ;;
                         esac
 		else