From 364af2ef2aba2911b12379ec8b6e55874e4b0a31 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Sep 2009 11:55:46 +0200
Subject: * cmdline/apt-key:   - Emit a warning if removed keys keyring is
 missing and skip associated     checks (LP: #218971)

---
 cmdline/apt-key | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7bb30240e..5f4e02fdf 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -93,13 +93,17 @@ update() {
     # add any security. we *need* this check on net-update though
     $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
 
-    # remove no-longer supported/used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
-    for key in $keys; do
-	if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
-	    $GPG --quiet --batch --delete-key --yes ${key}
-	fi
-    done
+    if [ -r "$REMOVED_KEYS" ]; then
+	# remove no-longer supported/used keys
+	keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
+	for key in $keys; do
+	    if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+		$GPG --quiet --batch --delete-key --yes ${key}
+	    fi
+	done
+    else
+	echo "Warning: removed keys keyring  $REMOVED_KEYS missing or not readable" >&2
+    fi
 }
 
 
-- 
cgit v1.2.3


From 8b8fdb116138b3adea3ce3c1fd51b3016902c8a5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 21:43:34 +0100
Subject: merged -r 1914..1915 from lp:~donkult/apt/sid

---
 cmdline/apt-mark | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index 226d2079b..c44ce7038 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -31,8 +31,12 @@ def mark_unmark_automatic(filename, action, pkgs):
     " mark or unmark automatic flag"
     # open the statefile
     if os.path.exists(STATE_FILE):
-        tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
-        outfile = open(STATE_FILE+".tmp","w")
+        try:
+            tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+            outfile = open(STATE_FILE+".tmp","w")
+        except IOError, msg:
+            print "%s, are you root?" % (msg)
+            sys.exit(1)
         while tagfile.Step():
             pkgname = tagfile.Section.get("Package")
             autoInst = tagfile.Section.get("Auto-Installed")
-- 
cgit v1.2.3


From 3f35be50ee4cb425b08139d4ccf5b54d527fe700 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 21:45:31 +0100
Subject: merged -r 1918..1919 from lp:~donkult/apt/sid

---
 cmdline/apt-mark | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index c44ce7038..3a818a3db 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -2,13 +2,14 @@
 
 from optparse import OptionParser
 
+import sys
+import os.path
+    
 try:
     import apt_pkg
 except ImportError:
     print "Error importing apt_pkg, is python-apt installed?"
-    
-import sys
-import os.path
+    sys.exit(1)
     
 actions = { "markauto" : 1,
             "unmarkauto": 0
-- 
cgit v1.2.3


From a0895a74fe95997a5d75e5b54c95afb9594554f6 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 21:59:49 +0100
Subject: merged -r 1923..1926 from lp:~donkult/apt/sid

---
 cmdline/apt-get.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'cmdline')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 52e90fc64..f84c82d28 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2811,6 +2811,7 @@ int main(int argc,const char *argv[])					/*{{{*/
       {0,"force-yes","APT::Get::force-yes",0},
       {0,"print-uris","APT::Get::Print-URIs",0},
       {0,"diff-only","APT::Get::Diff-Only",0},
+      {0,"debian-only","APT::Get::Diff-Only",0},
       {0,"tar-only","APT::Get::Tar-Only",0},
       {0,"dsc-only","APT::Get::Dsc-Only",0},
       {0,"purge","APT::Get::Purge",0},
-- 
cgit v1.2.3