Просмотр исходного кода

* debian/apt.cron.daily:
- move unattended-upgrade before apt-get autoclean
* fix "purge" commandline argument, closes LP: #125733
(thanks to Julien Danjou for the patch)
* fix missing SetExecClose() call when the status-fd is used
* debian/apt.cron.daily:
- move unattended-upgrade before apt-get autoclean
* fix "purge" commandline argument, closes: #133421
(thanks to Julien Danjou for the patch)

Michael Vogt лет назад: 19
Родитель
Сommit
821c6533d7
3 измененных файлов с 16 добавлено и 6 удалено
  1. 1 0
      cmdline/apt-get.cc
  2. 6 6
      debian/apt.cron.daily
  3. 9 0
      debian/changelog

+ 1 - 0
cmdline/apt-get.cc

@@ -2779,6 +2779,7 @@ int main(int argc,const char *argv[])
                                    {"install",&DoInstall},
                                    {"remove",&DoInstall},
 				   {"autoremove",&DoInstall},
+				   {"purge",&DoInstall},
                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
 				   {"build-dep",&DoBuildDep},

+ 6 - 6
debian/apt.cron.daily

@@ -186,17 +186,17 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
     update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
 fi
 
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
-    apt-get -qq autoclean
-    update_stamp $AUTOCLEAN_STAMP
-fi
-
 UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
 if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
     unattended-upgrade
     update_stamp $UPGRADE_STAMP
 fi
 
+AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+    apt-get -qq autoclean
+    update_stamp $AUTOCLEAN_STAMP
+fi
+
 # check cache size 
 check_size_constraints

+ 9 - 0
debian/changelog

@@ -5,6 +5,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
   * make apt build with g++ 4.3
   * fix missing SetExecClose() call when the status-fd is used
     (LP: #136767)
+  * debian/apt.cron.daily:
+    - move unattended-upgrade before apt-get autoclean
+  * fix "purge" commandline argument, closes LP: #125733
+    (thanks to Julien Danjou for the patch)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 
@@ -95,6 +99,11 @@ apt (0.7.6ubuntu1) gutsy; urgency=low
   * tests/local-repo:
     - added local repository testcase
   * make apt build with g++ 4.3
+  * fix missing SetExecClose() call when the status-fd is used
+  * debian/apt.cron.daily:
+    - move unattended-upgrade before apt-get autoclean
+  * fix "purge" commandline argument, closes: #133421
+    (thanks to Julien Danjou for the patch)
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.