소스 검색

* apt-pkg/deb/debindexfile.cc:
- ignore missing deb-src files in /var/lib/apt/lists, thanks
to Thorsten Spindler (LP: #85590)

Michael Vogt 15 년 전
부모
커밋
1aadba5adf
2개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      apt-pkg/deb/debindexfile.cc
  2. 3 0
      debian/changelog

+ 4 - 1
apt-pkg/deb/debindexfile.cc

@@ -66,7 +66,10 @@ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
    string SourcesURI = _config->FindDir("Dir::State::lists") + 
    string SourcesURI = _config->FindDir("Dir::State::lists") + 
       URItoFileName(IndexURI("Sources"));
       URItoFileName(IndexURI("Sources"));
    string SourcesURIgzip = SourcesURI + ".gz";
    string SourcesURIgzip = SourcesURI + ".gz";
-   if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))
+
+   if (!FileExists(SourcesURI) && !FileExists(SourcesURIgzip))
+      return NULL;
+   else if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))
       SourcesURI = SourcesURIgzip;
       SourcesURI = SourcesURIgzip;
 
 
    return new debSrcRecordParser(SourcesURI,this);
    return new debSrcRecordParser(SourcesURI,this);

+ 3 - 0
debian/changelog

@@ -6,6 +6,9 @@ apt (0.8.12) UNRELEASED; urgency=low
       mistake reported in bug LP: #641673, thanks to Robert Roth
       mistake reported in bug LP: #641673, thanks to Robert Roth
   * merged lp:~evfool/apt/fix418552:
   * merged lp:~evfool/apt/fix418552:
     - Grammar fix for bug LP: #418552, thanks to Robert Roth
     - Grammar fix for bug LP: #418552, thanks to Robert Roth
+  * apt-pkg/deb/debindexfile.cc:
+    - ignore missing deb-src files in /var/lib/apt/lists, thanks
+      to Thorsten Spindler (LP: #85590)
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100