diff options
| author | Michael Vogt <egon@bottom> | 2007-04-20 18:31:19 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2007-04-20 18:31:19 +0200 |
| commit | d4a6c3bbb1a57494256ad09c08cc21c9d4f2182a (patch) | |
| tree | 520b24fc6ff556f1cc77ff216c386eb07e4cd593 /apt-pkg/contrib | |
| parent | a7a5b0e45e2e66ab2142da8181bcc9cd0b3ba8a8 (diff) | |
| parent | bc50fc3013aa4454d10376888e4ccc24d35de334 (diff) | |
- only increase the score of installed applications if they
are not obsolete
- fix resolver bug on removal triggered by weak-dependencies
with or-groups
* methods/http.cc:
- send apt version in User-Agent
* apt-pkg/deb/debrecords.cc:
- fix SHA1Hash() return value
* apt-pkg/cdrom.cc:
- only unmount if APT::CDROM::NoMount is false
* methods/cdrom.cc:
- only umount if it was mounted by the method before
* po/gl.po:
- fix error translation that causes trouble to lsb_release
* apt-pkg/acquire-item.cc:
- if decompression of a index fails, delete the index
* apt-pkg/acquire.{cc,h}:
- deal better with duplicated sources.list entries (avoid
double queuing of URLs) - this fixes hangs in bzip/gzip
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
* merged from Christian Perrier:
* mr.po: New Marathi translation Closes: #416806
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cdromutl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 3180a03c7..db140ec02 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -8,7 +8,7 @@ ##################################################################### */ /*}}}*/ #ifndef PKGLIB_CDROMUTL_H -#define PKGLIB_ACQUIRE_METHOD_H +#define PKGLIB_CDROMUTL_H #include <string> @@ -21,5 +21,6 @@ using std::string; bool MountCdrom(string Path); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); +bool IsMounted(string &Path); #endif |