Update of /cvsroot/fink/3rdparty/apt/apt-pkg/deb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13997
Modified Files:
debsystem.cc
Log Message:
Fix indent levels and add some comments
Index: debsystem.cc
===================================================================
RCS file: /cvsroot/fink/3rdparty/apt/apt-pkg/deb/debsystem.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debsystem.cc 17 Mar 2006 04:19:21 -0000 1.3
+++ debsystem.cc 4 May 2006 00:49:31 -0000 1.4
@@ -317,7 +317,7 @@
List.push_back(StatusFile);
/* FINK LOCAL begin */
- if (FinkStatusFile == 0) {
+ if (FinkStatusFile == 0) { // haven't loaded fink data yet
struct stat unused_sbuf;
int sys_ok=0;
unlink(FINKSTATUSFILE);
@@ -325,31 +325,32 @@
if ( 0 == system("@PREFIX@/bin/fink-virtual-pkgs --apt")) sys_ok=1;
}
if (stat(FINKSTATUSFILE, &unused_sbuf) || !sys_ok) {
+ // no output file from fink-virtual-pkgs, so create one
+ // containing some bare-essential packages.
std::ofstream finkstatus(FINKSTATUSFILE);
- if(macosx_version.version != 0)
- {
- finkstatus << "Package: macosx" << endl;
- finkstatus << "Status: install ok installed" << endl;
- finkstatus << "Priority: optional" << endl;
- finkstatus << "Section: base" << endl;
- finkstatus << "Maintainer: None" << endl;
- finkstatus << "Source: macosx" << endl;
- finkstatus << "Version: " << macosx_version.version << endl;
- finkstatus << "Description: Pseudo package representing Mac OS X" <<
endl;
- finkstatus << " Pseudo package representing Mac OS X" << endl << endl;
- }
- finkstatus << "Package: darwin" << endl;
- finkstatus << "Status: install ok installed" << endl;
- finkstatus << "Priority: optional" << endl;
- finkstatus << "Section: base" << endl;
- finkstatus << "Maintainer: None" << endl;
- finkstatus << "Source: darwin" << endl;
- finkstatus << "Version: " << darwin_version.version << endl;
- finkstatus << "Description: Pseudo package representing Darwin" << endl;
- finkstatus << " Pseudo package representing Darwin" << endl << endl;
- finkstatus.close();
+ if(macosx_version.version != 0) {
+ finkstatus << "Package: macosx" << endl;
+ finkstatus << "Status: install ok installed" << endl;
+ finkstatus << "Priority: optional" << endl;
+ finkstatus << "Section: base" << endl;
+ finkstatus << "Maintainer: None" << endl;
+ finkstatus << "Source: macosx" << endl;
+ finkstatus << "Version: " << macosx_version.version << endl;
+ finkstatus << "Description: Pseudo package representing Mac OS X"
<< endl;
+ finkstatus << " Pseudo package representing Mac OS X" << endl <<
endl;
+ }
+ finkstatus << "Package: darwin" << endl;
+ finkstatus << "Status: install ok installed" << endl;
+ finkstatus << "Priority: optional" << endl;
+ finkstatus << "Section: base" << endl;
+ finkstatus << "Maintainer: None" << endl;
+ finkstatus << "Source: darwin" << endl;
+ finkstatus << "Version: " << darwin_version.version << endl;
+ finkstatus << "Description: Pseudo package representing Darwin" <<
endl;
+ finkstatus << " Pseudo package representing Darwin" << endl << endl;
+ finkstatus.close();
}
- FinkStatusFile = new debStatusIndex(FINKSTATUSFILE);
+ FinkStatusFile = new debStatusIndex(FINKSTATUSFILE); // load the file
}
List.push_back(FinkStatusFile);
/* FINK LOCAL end */
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
