[Demudi-commits] r346 - in demudi-cfengine/trunk: . chunks debian scripts

[Free Ekanayaka]

Author: free-guest
Date: 2004-12-22 01:42:12 -0700 (Wed, 22 Dec 2004)
New Revision: 346

Removed:
   demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
Modified:
   demudi-cfengine/trunk/cfagent.conf.in
   demudi-cfengine/trunk/debian/changelog
   demudi-cfengine/trunk/scripts/apt
Log:
demudi-cfengine:   
 * Inserting commented APT entries in sources.list if no network

Modified: demudi-cfengine/trunk/cfagent.conf.in
===================================================================
--- demudi-cfengine/trunk/cfagent.conf.in	2004-12-21 10:02:27 UTC (rev 345)
+++ demudi-cfengine/trunk/cfagent.conf.in	2004-12-22 08:42:12 UTC (rev 346)
@@ -14,10 +14,12 @@
 	#
 	# Useful variables
 	#
-	begin		= ( "### BEGIN DEMUDI" )
-	end		= ( "### END DEMUDI" )
-	comment		= ( "# these lines were automatically edited by demudi-cfengine, don't touch!" )
-	chunks		= ( "/usr/share/demudi-cfengine/chunks" )
+	begin    = ( "### BEGIN DEMUDI" )
+	end      = ( "### END DEMUDI" )
+	comment  = ( "# these lines were automatically edited by demudi-cfengine, don't touch!" )
+	chunks   = ( "/usr/share/demudi-cfengine/chunks" )
+	snapshot = ( "deb http://snapshot.debian.net/archive/2004/12/17/debian/ testing main" )
+	agnula   = ( "deb http://apt.agnula.org/demudi stable local" )
 
 	#
 	#  Decides what to be done and in which sequence

Deleted: demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
===================================================================
--- demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-12-21 10:02:27 UTC (rev 345)
+++ demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-12-22 08:42:12 UTC (rev 346)
@@ -1,7 +0,0 @@
-
-# Debian Sarge snapshot                                                            
-deb http://snapshot.debian.net/archive/2004/11/15/debian/ testing main
- 
-# A/DeMuDi packages
-deb http://apt.agnula.org/demudi stable local
-#deb-src http://apt.agnula.org/demudi stable local

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2004-12-21 10:02:27 UTC (rev 345)
+++ demudi-cfengine/trunk/debian/changelog	2004-12-22 08:42:12 UTC (rev 346)
@@ -1,3 +1,9 @@
+demudi-cfengine (0.11) unstable; urgency=low
+
+  * Inserting commented APT entries in sources.list if no network
+
+ -- Free Ekanayaka <free@agnula.org>  Wed, 22 Dec 2004 09:41:44 +0100
+
 demudi-cfengine (0.10) unstable; urgency=low
 
   * Removing cron and and ancron from rc.d script on new installs

Modified: demudi-cfengine/trunk/scripts/apt
===================================================================
--- demudi-cfengine/trunk/scripts/apt	2004-12-21 10:02:27 UTC (rev 345)
+++ demudi-cfengine/trunk/scripts/apt	2004-12-22 08:42:12 UTC (rev 346)
@@ -19,23 +19,35 @@
 		EndGroup
 	}
 
+	{ /etc/apt/sources.list
+		BeginGroupIfNoLineContaining "$(begin)"
+			Append "$(begin)"
+			Append "$(end)"
+			GotoLastLine
+			IncrementPointer "-1"
+		EndGroup
+
+		LocateLineMatching "$(begin)"
+		InsertLine "$(comment)"
+		InsertLine ""
+		InsertLine "# Debian Sarge snapshot"
+		InsertLine "#$(snapshot)"
+		InsertLine ""
+		InsertLine "# A/DeMuDi packages"
+		InsertLine "#$(agnula)"
+		InsertLine ""
+		IncrementPointer "1"
+		DeleteToLineMatching "$(end)"
+	}
+
 	networked::
-
 		{ /etc/apt/sources.list
-			BeginGroupIfNoLineContaining "$(begin)"
-				Append "$(begin)"
-				Append "$(end)"
-				GotoLastLine
-				IncrementPointer "-1"
-			EndGroup
-
-			LocateLineMatching "$(begin)"
-			InsertLine "$(comment)"
-			InsertFile "$(chunks)/apt-etc_apt_sources.list"
-			IncrementPointer "1"
-			DeleteToLineMatching "$(end)"
+			SetCommentStart "#"
+			UnCommentLinesContaining "$(snapshot)"
+			UnCommentLinesContaining "$(agnula)"
 		}
 
+
 shellcommands:
 
 	networked::