Browse Source

* apt-pkg/algorithms.cc:

- bugfix in the InstallProcted() code (preserver the auto-install information)
* cmdline/makefile:
  - install apt-mark as well
debian/1.8.y
Michael Vogt 16 years ago
parent
commit
c15f569038
  1. 9
      apt-pkg/algorithms.cc
  2. 6
      cmdline/makefile

9
apt-pkg/algorithms.cc

@ -1229,8 +1229,13 @@ void pkgProblemResolver::InstallProtect()
{
if ((Flags[I->ID] & ToRemove) == ToRemove)
Cache.MarkDelete(I);
else
Cache.MarkInstall(I, false, 0, false);
else
{
// preserver the information if the package was auto
// or manual installed
bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
Cache.MarkInstall(I, false, 0, !autoInst);
}
}
}
}

6
cmdline/makefile

@ -52,3 +52,9 @@ SOURCE=apt-key
TO=$(BIN)
TARGET=program
include $(COPY_H)
# The apt-mark program
SOURCE=apt-mark
TO=$(BIN)
TARGET=program
include $(COPY_H)

Loading…
Cancel
Save