[cvs] scripts/pdb .cvsignore, 1.4.2.2, 1.4.2.3 dump, 1.32.2.16, 1.32.2.17 pdb_full_update-piecewise, 1.7.2.6, 1.7.2.7 refresh, 1.18.2.5, 1.18.2.6

[Benjamin Reed]

Update of /cvsroot/fink/scripts/pdb
In directory sc8-pr-cvs17:/tmp/cvs-serv30421

Modified Files:
      Tag: redesign_pdb
        .cvsignore dump pdb_full_update-piecewise refresh 
Log Message:
merges from HEAD

Index: .cvsignore
===================================================================
RCS file: /cvsroot/fink/scripts/pdb/.cvsignore,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- .cvsignore  6 Sep 2007 08:43:05 -0000       1.4.2.2
+++ .cvsignore  10 Sep 2007 20:22:02 -0000      1.4.2.3
@@ -1,3 +1,5 @@
+.finkdbi
+finksql
 fink
 basepath
 *-stable.sql

Index: pdb_full_update-piecewise
===================================================================
RCS file: /cvsroot/fink/scripts/pdb/pdb_full_update-piecewise,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -d -r1.7.2.6 -r1.7.2.7
--- pdb_full_update-piecewise   10 Sep 2007 18:33:18 -0000      1.7.2.6
+++ pdb_full_update-piecewise   10 Sep 2007 20:22:02 -0000      1.7.2.7
@@ -2,14 +2,11 @@
 
 echo "Starting PDB update: `date`"
 
-./refresh 10.2-gcc3.3
-$HOME/bin/finksql <current_pdb_dump.sql
-./refresh 10.3
-$HOME/bin/finksql <current_pdb_dump.sql
-./refresh 10.4
-$HOME/bin/finksql <current_pdb_dump.sql
-./refresh 10.5
-$HOME/bin/finksql <current_pdb_dump.sql
+for dist in 10.2-gcc3.3 10.3 10.4 10.5; do
+       ./refresh $dist
+       ./finksql <current_pdb_dump.sql
+done
+
 
 echo "Fixing permissions"
 chgrp -R fink_web .

Index: dump
===================================================================
RCS file: /cvsroot/fink/scripts/pdb/dump,v
retrieving revision 1.32.2.16
retrieving revision 1.32.2.17
diff -u -d -r1.32.2.16 -r1.32.2.17
--- dump        10 Sep 2007 19:36:24 -0000      1.32.2.16
+++ dump        10 Sep 2007 20:22:02 -0000      1.32.2.17
@@ -263,7 +263,7 @@
   $q = "INSERT INTO `package` (";
   $v = ") VALUES (";
   foreach $key (keys %data) {
-    $q .= "$key,";
+    $q .= "\`$key\`,";
     $s = $data{$key};
     $s =~ s/'/\\'/g;
     $v .= "'$s',";

Index: refresh
===================================================================
RCS file: /cvsroot/fink/scripts/pdb/refresh,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -d -r1.18.2.5 -r1.18.2.6
--- refresh     10 Sep 2007 17:52:05 -0000      1.18.2.5
+++ refresh     10 Sep 2007 20:22:02 -0000      1.18.2.6
@@ -18,11 +18,8 @@
 done
 
 echo "Updating [EMAIL PROTECTED] from CVS..."
-if [ -d fink ]; then
-  cd fink
-  cvs -z3 -q update -Al
-  cvs -z3 -q update -Ad [EMAIL PROTECTED]
-  cd ..
+if [ -d fink ] && [ -d /var/www/finkinfo/dists.public ]; then
+  rsync --delete -avr /var/www/finkinfo/dists.public/ fink/
 else
   cvs -z3 -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink co -d fink dists
 fi


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits