[Aptitude-svn-commit] r4068 - in branches/aptitude-0.3/aptitude: . doc/en src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Fri Sep  9 22:37:10 2005
New Revision: 4068

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
Log:
Add an option that bypasses the trust check in command-line mode.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep  9 22:37:10 2005
@@ -1,5 +1,11 @@
 2005-09-09  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml, src/cmdline/cmdline_prompt.cc:
+
+	  By popular demand, add a configuration option to bypass the
+	  trust check in command-line mode (apparently this is useful for
+	  scripted installations and so on).
+
 	* src/download_list.cc:
 
 	  Eliminate all uses of vscreen_mainloop by using the continuation

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Fri Sep  9 22:37:10 2005
@@ -7463,6 +7463,16 @@
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configCmdLine-Ignore-Trust-Violations'>
+	      <seg><literal>Aptitude::CmdLine::Ignore-Trust-Violations</literal></seg>
+	      <seg><literal>false</literal></seg>
+	      <seg>
+		In command-line mode, causes the program to ignore the
+		installation of <link
+		linkend='secTrust'>untrusted packages</link>.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configCmdLine-Resolver-Debug'>
 	      <seg><literal>Aptitude::CmdLine::Resolver-Debug</literal></seg>
 	      <seg><literal>false</literal></seg>

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	Fri Sep  9 22:37:10 2005
@@ -381,6 +381,13 @@
 
       printf("\n");
 
+
+      if(aptcfg->FindB(PACKAGE "::CmdLine::Ignore-Trust-Violations", false))
+	printf(_("*** WARNING ***   Ignoring these trust violations because\n"
+		 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"),
+	       PACKAGE);
+
+
       const string okstr=_("Yes"), abortstr=_("No");
 
       while(1)