فهرست منبع

teach genpkglist to write its index file to target directory (and not parent dir), too

Ralf S. Engelschall 22 سال پیش
والد
کامیت
416f959373
1فایلهای تغییر یافته به همراه28 افزوده شده و 26 حذف شده
  1. 28 26
      apt/apt.patch

+ 28 - 26
apt/apt.patch

@@ -341,32 +341,6 @@
     if (Gen.MergeFileProvides(Parser) == false)
        return _error->Error(_("Problem with MergeFileProvides %s"),
  			   PackageFile.c_str());
---- tools/genpkglist.cc.orig	2003-06-10 16:14:47.000000000 +0200
-+++ tools/genpkglist.cc	2003-09-16 11:05:22.000000000 +0200
-@@ -544,9 +544,9 @@
-       }
-    }
-    pkglist_path = string(rpmsdir);
--   rpmsdir = rpmsdir + "/RPMS." + string(op_suf);
-+   rpmsdir = rpmsdir + "/" + string(op_suf);
- 
--   string dirtag = "RPMS." + string(op_suf);
-+   string dirtag = string(op_suf);
- 
-    entry_no = scandir(rpmsdir.c_str(), &dirEntries, selectDirent, alphasort);
-    if (entry_no < 0) {
-@@ -558,9 +558,9 @@
-    chdir(rpmsdir.c_str());
-    
-    if (pkgListSuffix != NULL)
--	   pkglist_path = pkglist_path + "/base/pkglist." + pkgListSuffix;
-+	   pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + pkgListSuffix;
-    else
--	   pkglist_path = pkglist_path + "/base/pkglist." + op_suf;
-+	   pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + op_suf;
-    
-    
-    if (pkgListAppend == true && FileExists(pkglist_path)) {
 --- apt-pkg/sourcelist.cc.orig	2003-09-16 12:02:35.000000000 +0200
 +++ apt-pkg/sourcelist.cc	2003-09-16 12:05:04.000000000 +0200
 @@ -102,7 +102,7 @@
@@ -541,3 +515,31 @@
     
     if (srcListAppend == true && FileExists(buf)) {
        outfd = fdOpen(buf, O_WRONLY|O_APPEND, 0644);
+--- tools/genpkglist.cc.orig	2003-09-16 15:15:42.000000000 +0200
++++ tools/genpkglist.cc	2003-09-16 15:18:39.000000000 +0200
+@@ -543,10 +543,10 @@
+ 	 rpmsdir = string(op_dir);
+       }
+    }
+-   pkglist_path = string(rpmsdir);
+-   rpmsdir = rpmsdir + "/RPMS." + string(op_suf);
++   pkglist_path = rpmsdir + "/" + string(op_suf);
++   rpmsdir = rpmsdir + "/" + string(op_suf);
+ 
+-   string dirtag = "RPMS." + string(op_suf);
++   string dirtag = string(op_suf);
+ 
+    entry_no = scandir(rpmsdir.c_str(), &dirEntries, selectDirent, alphasort);
+    if (entry_no < 0) {
+@@ -558,9 +558,9 @@
+    chdir(rpmsdir.c_str());
+    
+    if (pkgListSuffix != NULL)
+-	   pkglist_path = pkglist_path + "/base/pkglist." + pkgListSuffix;
++	   pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + pkgListSuffix;
+    else
+-	   pkglist_path = pkglist_path + "/base/pkglist." + op_suf;
++	   pkglist_path = pkglist_path + "/00INDEX.apt-pkglist." + op_suf;
+    
+    
+    if (pkgListAppend == true && FileExists(pkglist_path)) {