From fc84284c3dbbf15cc369ea944bf246df7ea06d7b Mon Sep 17 00:00:00 2001
From: slakmagik <slakmagik@18908463-3d48-0410-af50-6b38eb639d31>
Date: Sun, 24 May 2009 20:57:04 +0000
Subject: [PATCH] add stripcom() and use it in save_user_queue() to make sure
 we're only comparing relevant things when deciding whether to save the queue
 on exit

---
 src/usr/sbin/sbopkg | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index 6c98f4e..9138631 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -1457,6 +1457,16 @@ rename_user_queue() {
     done
 }
 
+stripcom() {
+    local _file="$1"
+
+    sed '
+        /^[ \t]*#/d
+        s/[ \t][ \t]*#.*//
+        /^[ \t]*$/d
+        ' $_file
+}
+
 save_user_queue() {
     # This function saves the build queue to the filename the user specifies.
     # If --end is specified as first parameter, assume that the user is
@@ -1484,7 +1494,8 @@ save_user_queue() {
         if [[ ! -s $TMPQUEUE ]]; then
             return 1
         elif [[ -f $LAST_USER_QUEUE_ON_DISK ]] &&
-                diff $LAST_USER_QUEUE_ON_DISK $SAVEQUEUE > /dev/null; then
+                diff <(stripcom $LAST_USER_QUEUE_ON_DISK) $SAVEQUEUE &> \
+                    /dev/null; then
             # The active queue is unchanged since the last loaded/saved one
             return 0
         else
@@ -1522,8 +1533,9 @@ save_user_queue() {
             if [[ -e $USERQUEUE_NAME.sboq ]]; then
                 dialog --title "ERROR" --yesno "$(crunch "Another file \
                     with that name already exists.  Press <Yes> to \
-                    continue and overwrite the other file, or press <No> \
-                    to cancel.")" 10 50
+                    continue and overwrite the other file (keep in mind that \
+                    the active queue will not preserve any comments from an \
+                    on-disk queue), or press <No> to cancel.")" 10 50
                 if [[ $? != 0 ]]; then
                     continue
                 fi