Changeset 36

Timestamp:

12/22/07 18:47:54 (1 year ago)

Author:

bkuhn

Message:

• Discovered that update-loblaw-test.plx was not doing hg operations
  correctly. Apparently they all must be done with relative, not
  absolute, path names. I added various chdirs() to make them happen in
  the right place.
  
• Added phpldapadmin config file to file list.
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/dev-tools/loblaw-unpackaged-files.dat (modified) (1 diff)
• trunk/dev-tools/update-loblaw-test.plx (modified) (3 diffs)

trunk/ChangeLog

@@ -1 +1 @@
-2007-12-22  Bradley M. Kuhn  <bkuhn@softwarefreedom.org>
+
+        * dev-tools/update-loblaw-test.plx (ProcessRevision): Added
+        various chdir() commands.
+
+        * configs/ldap/slapd.conf: Added 'access to dn.base="" by * read'
+        because apparently we need this to make initial reads work.
-
-        * dev-tools/update-loblaw-test.plx (ProcessRevision): Fixed hg

trunk/dev-tools/loblaw-unpackaged-files.dat

@@ -6 +6 @@
-configs/apache/intranet.example.org => /etc/apache2/sites-available/intranet.example.org
-configs/apache/ports.conf => /etc/apache2/ports.conf
+configs/apache/phpldapadmin-config.php => /etc/phpldapadmin/config.php
+

trunk/dev-tools/update-loblaw-test.plx

@@ -302 +302 @@
-    my $outputFile = $DUAL_REVISIONED_FILE_LIST{$inputFile};
-
+    chdir $LOBLAW_TEST_HG_CHECKOUT or
+      DieLog("unable to change directory to $LOBLAW_TEST_HG_CHECKOUT: $!");
+
-    if ($operation =~ /^\s*(?:U|M|\~|L|A)\s*/) {
-      my($dir, $filename);
@@ -320 +323 @@
-             $LOCK_CLEANUP_CODE);
-      }
-LOBLAW_TEST_HG_CHECKOUT/$
+
-        if ($operation =~ /^\s*A\s*/);
-    } elsif ($operation =~ /^\s*D\s*/) {
-      unlink("$LOBLAW_TEST_HG_CHECKOUT/$outputFile");
-
-
+
-    } else {
-      DieLog("Invalid svnlook status, $operation, in $changeLine",
-             $LOCK_CLEANUP_CODE);
-    }
+    chdir $LOBLAW_TRUNK_CHECKOUT or
+      DieLog("unable to change directory to $LOBLAW_TRUNK_CHECKOUT: $!");
-    my @svnLog = read_from_process($SVN, '-r', $revision, 'log', $inputFile);
-    my($tempFH, $tempFile) = mkstemps( "hgcommitXXXXXX", ".log");
@@ -339 +343 @@
-    }
-    $tempFH->close();
+    chdir $LOBLAW_TEST_HG_CHECKOUT or
+      DieLog("unable to change directory to $LOBLAW_TEST_HG_CHECKOUT: $!");
-    my @vals = read_from_process($HG, 'commit', '-l', $tempFile,
-LOBLAW_TEST_HG_CHECKOUT/$
+
-    unlink($tempFile);
-    DieLog("Unexpected output from commit: " . join("\n", @vals),