OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Sep-2003 13:59:03
Branch: HEAD Handle: 2003091612590300
Modified files:
openpkg-src/apt apt.patch
Log:
next round in path fiddling
Summary:
Revision Changes Path
1.5 +48 -15 openpkg-src/apt/apt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 apt.patch
--- openpkg-src/apt/apt.patch 16 Sep 2003 10:10:03 -0000 1.4
+++ openpkg-src/apt/apt.patch 16 Sep 2003 11:59:03 -0000 1.5
@@ -477,9 +477,38 @@
if (pkgListAppend == true && FileExists(pkglist_path)) {
---- tools/gensrclist.cc.orig 2003-06-10 16:14:44.000000000 +0200
-+++ tools/gensrclist.cc 2003-09-16 11:05:41.000000000 +0200
-@@ -198,10 +198,10 @@
+--- 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 @@
+ // Check for an absolute dists specification.
+ if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
+ {
+- if (ParseQuoteWord(Buffer,Section) == true)
++ if (ParseQuoteWord(Buffer,Section) == false)
+ return _error->Error(_("Malformed line %lu in source list %s (Absolute
dist)"),CurLine,File.c_str());
+ Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+ return CreateItem(List,URI,Dist,Section,Vendor);
+--- apt-pkg/rpm/rpmsrcrecords.cc.orig 2003-06-10 16:12:48.000000000 +0200
++++ apt-pkg/rpm/rpmsrcrecords.cc 2003-09-16 13:54:50.000000000 +0200
+@@ -116,15 +116,6 @@
+ F.Path = string(dir)+"/"+string(srpm);
+ F.Type = "srpm";
+
+-#ifndef REMOVE_THIS_SOMEDAY
+- /* This code is here to detect if that's a "new" style SRPM directory
+- * scheme, or an old style. Someday, when most repositories were already
+- * rebuilt with the new gensrclist tool, this code may be safely
+- * removed. */
+- if (F.Path[0] != '.')
+- F.Path = "../" + F.Path;
+-#endif
+-
+ List.push_back(F);
+
+ return true;
+--- tools/gensrclist.cc.orig 2003-09-16 13:36:47.000000000 +0200
++++ tools/gensrclist.cc 2003-09-16 13:38:01.000000000 +0200
+@@ -281,10 +281,10 @@
} else
strcpy(buf, arg_dir);
@@ -492,7 +521,22 @@
#ifdef OLD_FLATSCHEME
if (flatStructure) {
// add the last component of the directory to srpmdir
-@@ -242,9 +242,9 @@
+@@ -304,14 +304,6 @@
+ #else
+ if (!flatStructure) {
+ srpmdir = "../"+srpmdir;
+-#ifndef REMOVE_THIS_SOMEDAY
+- /* This code is here just so that code in rpmsrcrecords.cc is able
+- * to detect if that's a "new" style SRPM directory scheme, or an
+- * old style. Someday, when most repositories were already rebuilt
+- * with that new gensrclist tool, this code may be safely removed. */
+- } else {
+- srpmdir = "./"+srpmdir;
+-#endif
+ }
+ #endif
+
+@@ -325,9 +317,9 @@
chdir(buf);
if (srcListSuffix != NULL)
@@ -504,14 +548,3 @@
if (srcListAppend == true && FileExists(buf)) {
outfd = fdOpen(buf, O_WRONLY|O_APPEND, 0644);
---- 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 @@
- // Check for an absolute dists specification.
- if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
- {
-- if (ParseQuoteWord(Buffer,Section) == true)
-+ if (ParseQuoteWord(Buffer,Section) == false)
- return _error->Error(_("Malformed line %lu in source list %s (Absolute
dist)"),CurLine,File.c_str());
- Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
- return CreateItem(List,URI,Dist,Section,Vendor);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
