Merge branch 'master' into database

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index ab35b814dae6f2c50797dc50c5d6fb069d3f8301..1dc6ef8a73e91c4de7470fcb1f831ef4c514b804 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -521,12 +521,14 @@ sub lock_read_all_merged_bugs {
            push @data,$newdata;
            # perform a sanity check to make sure that the merged bugs
            # are all merged with eachother
-           my $expectmerge= join(' ',grep {$_ != $bug } sort { $a <=> $b } @bugs);
+        # We do a cmp sort instead of an <=> sort here, because that's
+        # what merge does
+           my $expectmerge= join(' ',grep {$_ != $bug } sort @bugs);
            if ($newdata->{mergedwith} ne $expectmerge) {
                for (1..$locks) {
                    unfilelock(exists $param{locks}?$param{locks}:());
                }
-               die "Bug $param{bug} differs from bug $bug: ($newdata->{bug_num}: '$newdata->{mergedwith}') vs. ('$expectmerge') (".join(' ',@bugs).")";
+               die "Bug $param{bug} mergedwith differs from bug $bug: ($newdata->{bug_num}: '$newdata->{mergedwith}') vs. ('$expectmerge') (".join(' ',@bugs).")";
            }
        }
     }

diff --git a/Makefile b/Makefile
index 587670406b9eb7578055036259ac1741152e58e5..19a074bb0abba18683d8e3c56cc5b2028c94b58f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ install_mostfiles:
        # create the directories if they aren't there
        for dir in $(sbin_dir) $(etc_dir)/html $(etc_dir)/indices \
 $(var_dir)/indices $(var_dir)/www/cgi $(var_dir)/www/db $(var_dir)/www/txt \
+$(var_dir)/www/css \
 $(var_dir)/spool/lock $(var_dir)/spool/archive $(var_dir)/spool/incoming \
 $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
           do test -d $$dir || $(install_exec) -d $$dir; done
@@ -82,7 +83,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
        # install the HTML pages etc
        $(foreach html, $(htmls_in), $(install_data) $(html) $(etc_dir)/html;)
        $(install_data) html/htaccess $(var_dir)/www/db/.htaccess
-       $(install_data) html/bugs.css $(var_dir)/www/bugs.css
+       $(install_data) html/bugs.css $(var_dir)/www/css/bugs.css
 
        # install the CGIs
        for cgi in $(cgis); do $(install_exec) $$cgi $(var_dir)/www/cgi; done