Browse Source

change gpgv.cc to update sh path

Kevin Bradley 10 months ago
parent
commit
c107d7b0e3
3 changed files with 4 additions and 3 deletions
  1. 2 2
      CMakeLists.txt
  2. 1 1
      apt-pkg/contrib/gpgv.cc
  3. 1 0
      methods/aptmethod.h

+ 2 - 2
CMakeLists.txt

@@ -13,8 +13,8 @@ enable_testing()
 option(WITH_DOC "Build documentation." ON)
 option(USE_NLS "Localisation support." ON)
 
-INCLUDE_DIRECTORIES(/usr/src/skel/usr/include)
-LINK_DIRECTORIES(/usr/src/skel/usr/lib)
+INCLUDE_DIRECTORIES(/Users/bradleyk/Projects/m4/skel/fs/jb/usr/include)
+LINK_DIRECTORIES(/Users/bradleyk/Projects/m4/skel/fs/jb/usr/lib)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake")
 

+ 1 - 1
apt-pkg/contrib/gpgv.cc

@@ -105,7 +105,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
    std::vector<const char *> Args;
    Args.reserve(11);
 
-   Args.push_back("/bin/sh");
+   Args.push_back("/fs/jb/bin/sh");
    Args.push_back(aptkey.c_str());
    Args.push_back("--quiet");
    Args.push_back("--readonly");

+ 1 - 0
methods/aptmethod.h

@@ -70,6 +70,7 @@ public:
    }
    bool DebugEnabled() const
    {
+       //return true; //comment this in for more debug info
       if (methodNames.empty())
 	 return false;
       auto const sni = std::find_if_not(methodNames.crbegin(), methodNames.crend(), hasDoubleColon);