tests: try to support spaces in TMPDIR

[apt.git] / apt-pkg / pkgsystem.cc

diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 6dd2d3ee4df348eab8e2e05c3f3d5beff22126be..a6b61e65563fabf174f4316fe902c94814f28e1b 100644 (file)
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -10,8 +10,11 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include<config.h>
+

 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgsystem.h>

-#include <apt-pkg/policy.h>
+#include <apt-pkg/macros.h>
+

 #include <cassert>
 #include <cstring>
                                                                        /*}}}*/
 #include <cassert>
 #include <cstring>
                                                                        /*}}}*/


@@ -24,17 +27,18 @@ unsigned long pkgSystem::GlobalListLen = 0;
 // System::pkgSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* Add it to the global list.. */
 // System::pkgSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* Add it to the global list.. */

-pkgSystem::pkgSystem()
+pkgSystem::pkgSystem(char const * const label, pkgVersioningSystem * const vs) :
+   Label(label), VS(vs), d(NULL)

 {
    assert(GlobalListLen < sizeof(SysList)/sizeof(*SysList));
    SysList[GlobalListLen] = this;
 {
    assert(GlobalListLen < sizeof(SysList)/sizeof(*SysList));
    SysList[GlobalListLen] = this;

-   GlobalListLen++;
+   ++GlobalListLen;

 }
                                                                        /*}}}*/
 // System::GetSystem - Get the named system                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
                                                                        /*}}}*/
 // System::GetSystem - Get the named system                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgSystem *pkgSystem::GetSystem(const char *Label)
+APT_PURE pkgSystem *pkgSystem::GetSystem(const char *Label)

 {
    for (unsigned I = 0; I != GlobalListLen; I++)
       if (strcmp(SysList[I]->Label,Label) == 0)
 {
    for (unsigned I = 0; I != GlobalListLen; I++)
       if (strcmp(SysList[I]->Label,Label) == 0)


@@ -42,3 +46,5 @@ pkgSystem *pkgSystem::GetSystem(const char *Label)
    return 0;   
 }
                                                                        /*}}}*/
    return 0;   
 }
                                                                        /*}}}*/

+
+pkgSystem::~pkgSystem() {}