[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#341880: Bug #341880: Proposed modifications to rootskel-gtk and installation-report packages



Attilio Fiandrotti wrote:
> Also, some modifications to the "httpd" web server from 
> "installation-report" package are needed to make the user able to 
> distinguish between log files and screenshots that are stored into 
> /var/log.

Perhaps this patch is a better approach, it should make it easy to save
the screenshots without right click nonsense.

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 32902)
+++ debian/changelog	(working copy)
@@ -2,8 +2,10 @@
 
   * Default to the web server in the menu if there is an IP address since it
     is much more likely to be usable than the other menu items in this case.
+  * httpd: Add mime type handling for ppm screenshot files.
+  * postinst: Include any ppm screenshot files when saving logs to media.
 
- -- Joey Hess <joeyh@debian.org>  Thu,  8 Dec 2005 01:58:33 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon, 12 Dec 2005 13:09:11 -0500
 
 installation-report (2.9) unstable; urgency=low
 
Index: httpd
===================================================================
--- httpd	(revision 32902)
+++ httpd	(working copy)
@@ -47,7 +47,11 @@
 	done
 	echo "</ul></html>"
 elif [ -e "$DOCROOT/$page" ]; then
-	header 200 "OK" "text/plain"
+	if [ "${page%.ppm}" != "$page" ]; then
+		header 200 "OK" "image/x-portable-pixmap"
+	else
+		header 200 "OK" "text/plain"
+	fi
 	if ! cat "$DOCROOT/$page" 2>/dev/null; then
 		echo "error!"
 	fi
Index: debian/save-logs.postinst
===================================================================
--- debian/save-logs.postinst	(revision 32902)
+++ debian/save-logs.postinst	(working copy)
@@ -21,6 +21,7 @@
 	    /var/lib/dpkg/status \
 	    /var/log/hardware-summary \
 	    /var/log/package-versions \
+	    /var/log/*.ppm \
 	    /usr/share/save-logs/install-report.template; do 
 	    	if [ -e "$file" ]; then
 			if ! cp "$file" "$dir"; then

-- 
see shy jo

Attachment: signature.asc
Description: Digital signature


Reply to: