summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/zzapt.cron.daily (renamed from debian/apt.cron.daily)0
-rw-r--r--methods/rsh.cc3
3 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 051bfc5da..f288c1b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (0.8.13) unstable; urgency=low
+
+ [ Thorsten Spindler ]
+ * debian/zzapt.cron.daily:
+ - move cron job to the end of execution (LP: #727685)
+ * methods/rsh.cc
+ - fix rsh/ssh option parsing (LP: #678080), thanks to
+ Ville Mattila
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100
+
apt (0.8.12) unstable; urgency=low
[ Michael Vogt ]
diff --git a/debian/apt.cron.daily b/debian/zzapt.cron.daily
index c61bfb9bb..c61bfb9bb 100644
--- a/debian/apt.cron.daily
+++ b/debian/zzapt.cron.daily
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 97b4ef151..21f0d0a22 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -110,6 +110,8 @@ bool RSHConn::Connect(string Host, string User)
// Probably should do
// dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
+ Args[i++] = Prog;
+
// Insert user-supplied command line options
Configuration::Item const *Opts = RshOptions;
if (Opts != 0)
@@ -123,7 +125,6 @@ bool RSHConn::Connect(string Host, string User)
}
}
- Args[i++] = Prog;
if (User.empty() == false) {
Args[i++] = "-l";
Args[i++] = User.c_str();