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

[marcell at garage.maemo.org]

Author: marcell
Date: 2008-05-07 14:27:51 +0300 (Wed, 07 May 2008)
New Revision: 42

Modified:
   queue-manager/trunk/queue-manager-lib
Log:
QM should accept the ORIGIN variable from config files and use that when creating a Release file.


Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2008-05-02 07:13:19 UTC (rev 41)
+++ queue-manager/trunk/queue-manager-lib	2008-05-07 11:27:51 UTC (rev 42)
@@ -912,7 +912,7 @@
 				cat > "$ARCHIVE_DIR/dists/${PROJECT:+project/}$SUITE/$DIST/binary-$ARCH/Release.new" <<EOF
 Archive: $SUITE
 Component: $DIST
-Origin: Nokia
+Origin: $ORIGIN
 Label: $SUITE
 Architecture: $ARCH
 EOF
@@ -926,7 +926,7 @@
 				done
 				cat > "$ARCHIVE_DIR/dists/${PROJECT:+project/}$SUITE/Release.new" <<EOF
 Archive: $SUITE
-Origin: Nokia
+Origin: $ORIGIN
 Label: $SUITE
 Suite: $SUITE
 Codename: $SUITE
@@ -1267,7 +1267,7 @@
 		cat > $BASE/apt.conf << EOF
 APT::FTPArchive::Release {
   Version       "2.0";
-  Origin        "Nokia";
+  Origin        "$ORIGIN";
   Architectures "$ARCHS";
   Components    "$DISTS";
   Suite         "$suite";