acquire.h | acquire.h | |||
---|---|---|---|---|
skipping to change at line 364 | skipping to change at line 364 | |||
/** \brief Destroy this pkgAcquire object. | /** \brief Destroy this pkgAcquire object. | |||
* | * | |||
* Destroys all queue, method, and item objects associated with | * Destroys all queue, method, and item objects associated with | |||
* this download. | * this download. | |||
*/ | */ | |||
virtual ~pkgAcquire(); | virtual ~pkgAcquire(); | |||
private: | private: | |||
/** \brief FD of the Lock file we acquire in Setup (if any) */ | /** \brief FD of the Lock file we acquire in Setup (if any) */ | |||
int LockFD; | int LockFD; | |||
/** \brief Ensure the existence of the given Path | ||||
* | ||||
* \param Parent directory of the Path directory - a trailing | ||||
* /apt/ will be removed before CreateDirectory call. | ||||
* \param Path which should exist after (successful) call | ||||
*/ | ||||
bool CheckDirectory(string const &Parent, string const &Path) const; | ||||
}; | }; | |||
/** \brief Represents a single download source from which an item | /** \brief Represents a single download source from which an item | |||
* should be downloaded. | * should be downloaded. | |||
* | * | |||
* An item may have several assocated ItemDescs over its lifetime. | * An item may have several assocated ItemDescs over its lifetime. | |||
*/ | */ | |||
struct pkgAcquire::ItemDesc : public WeakPointable | struct pkgAcquire::ItemDesc : public WeakPointable | |||
{ | { | |||
/** \brief The URI from which to download this item. */ | /** \brief The URI from which to download this item. */ | |||
End of changes. 1 change blocks. | ||||
8 lines changed or deleted | 0 lines changed or added | |||
config.h | config.h | |||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
/* Define if we have enabled pthread support */ | /* Define if we have enabled pthread support */ | |||
/* #undef HAVE_PTHREAD */ | /* #undef HAVE_PTHREAD */ | |||
/* If there is no socklen_t, define this for the netdb shim */ | /* If there is no socklen_t, define this for the netdb shim */ | |||
/* #undef NEED_SOCKLEN_T_DEFINE */ | /* #undef NEED_SOCKLEN_T_DEFINE */ | |||
/* Define the arch name string */ | /* Define the arch name string */ | |||
#define COMMON_ARCH "i386" | #define COMMON_ARCH "i386" | |||
/* The version number string */ | /* The version number string */ | |||
#define VERSION "0.8.1" | #define VERSION "0.8.3" | |||
/* The package name string */ | /* The package name string */ | |||
#define PACKAGE "apt" | #define PACKAGE "apt" | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
fileutl.h | fileutl.h | |||
---|---|---|---|---|
skipping to change at line 97 | skipping to change at line 97 | |||
FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; | FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; | |||
virtual ~FileFd(); | virtual ~FileFd(); | |||
}; | }; | |||
bool RunScripts(const char *Cnf); | bool RunScripts(const char *Cnf); | |||
bool CopyFile(FileFd &From,FileFd &To); | bool CopyFile(FileFd &From,FileFd &To); | |||
int GetLock(string File,bool Errors = true); | int GetLock(string File,bool Errors = true); | |||
bool FileExists(string File); | bool FileExists(string File); | |||
bool DirectoryExists(string const &Path) __attrib_const; | bool DirectoryExists(string const &Path) __attrib_const; | |||
bool CreateDirectory(string const &Parent, string const &Path); | bool CreateDirectory(string const &Parent, string const &Path); | |||
/** \brief Ensure the existence of the given Path | ||||
* | ||||
* \param Parent directory of the Path directory - a trailing | ||||
* /apt/ will be removed before CreateDirectory call. | ||||
* \param Path which should exist after (successful) call | ||||
*/ | ||||
bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path); | ||||
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ex t, | std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ex t, | |||
bool const &SortList, bool const &Al lowNoExt=false); | bool const &SortList, bool const &Al lowNoExt=false); | |||
std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<stri ng> const &Ext, | std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<stri ng> const &Ext, | |||
bool const &SortList); | bool const &SortList); | |||
string SafeGetCWD(); | string SafeGetCWD(); | |||
void SetCloseExec(int Fd,bool Close); | void SetCloseExec(int Fd,bool Close); | |||
void SetNonBlock(int Fd,bool Block); | void SetNonBlock(int Fd,bool Block); | |||
bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); | bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); | |||
pid_t ExecFork(); | pid_t ExecFork(); | |||
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); | bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 9 lines changed or added | |||
init.h | init.h | |||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
#include <apt-pkg/configuration.h> | #include <apt-pkg/configuration.h> | |||
#include <apt-pkg/pkgsystem.h> | #include <apt-pkg/pkgsystem.h> | |||
// These lines are extracted by the makefiles and the buildsystem | // These lines are extracted by the makefiles and the buildsystem | |||
// Increasing MAJOR or MINOR results in the need of recompiling all | // Increasing MAJOR or MINOR results in the need of recompiling all | |||
// reverse-dependencies of libapt-pkg against the new SONAME. | // reverse-dependencies of libapt-pkg against the new SONAME. | |||
// Non-ABI-Breaks should only increase RELEASE number. | // Non-ABI-Breaks should only increase RELEASE number. | |||
// See also buildlib/libversion.mak | // See also buildlib/libversion.mak | |||
#define APT_PKG_MAJOR 4 | #define APT_PKG_MAJOR 4 | |||
#define APT_PKG_MINOR 10 | #define APT_PKG_MINOR 10 | |||
#define APT_PKG_RELEASE 0 | #define APT_PKG_RELEASE 1 | |||
extern const char *pkgVersion; | extern const char *pkgVersion; | |||
extern const char *pkgLibVersion; | extern const char *pkgLibVersion; | |||
bool pkgInitConfig(Configuration &Cnf); | bool pkgInitConfig(Configuration &Cnf); | |||
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); | bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); | |||
#ifdef APT_COMPATIBILITY | #ifdef APT_COMPATIBILITY | |||
#if APT_COMPATIBILITY != 986 | #if APT_COMPATIBILITY != 986 | |||
#warning "Using APT_COMPATIBILITY" | #warning "Using APT_COMPATIBILITY" | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||