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

* cmdline/apt-mark:
- Fix chmoding after have renamed the extended-states file (LP: #140019)
(thanks to Laurent Bigonville)

Michael Vogt лет назад: 19
Родитель
Сommit
526d43695b
2 измененных файлов с 5 добавлено и 2 удалено
  1. 2 2
      cmdline/apt-mark
  2. 3 0
      debian/changelog

+ 2 - 2
cmdline/apt-mark

@@ -40,7 +40,7 @@ if __name__ == "__main__":
     if not options.filename:
     if not options.filename:
         STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
         STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
     else:
     else:
-        STATE_FILE=options.state_file
+        STATE_FILE=options.filename
 
 
     # open the statefile
     # open the statefile
     if os.path.exists(STATE_FILE):
     if os.path.exists(STATE_FILE):
@@ -62,4 +62,4 @@ if __name__ == "__main__":
         # all done, rename the tmpfile
         # all done, rename the tmpfile
         os.chmod(outfile.name, 0644)
         os.chmod(outfile.name, 0644)
         os.rename(outfile.name, STATE_FILE)
         os.rename(outfile.name, STATE_FILE)
-        os.chmod(outfile.name, 0644)
+        os.chmod(STATE_FILE, 0644)

+ 3 - 0
debian/changelog

@@ -34,6 +34,9 @@ apt (0.7.7) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
   * cmdline/apt-get.cc:
     - do not change the auto-installed information if a package
     - do not change the auto-installed information if a package
       is reinstalled
       is reinstalled
+  * cmdline/apt-mark:
+    - Fix chmoding after have renamed the extended-states file (LP: #140019)
+      (thanks to Laurent Bigonville)
 
 
   [ Ian Jackson ]
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.
   * dpkg-triggers: Deal properly with new package states.