[Lunar-commits] r15105 - in lunar/trunk: bin usr/share/man/man1

Auke Kok sofar at lunar-linux.org
Fri May 27 13:50:49 UTC 2005


Author: sofar
Date: 2005-05-27 13:50:48 +0000 (Fri, 27 May 2005)
New Revision: 15105

Modified:
   lunar/trunk/bin/lvu
   lunar/trunk/usr/share/man/man1/lvu.1
Log:
lvu submit now uses a 'patch' to submit changes. Since this is an attachment it can be easily saved and still viewed inline in a mail client. Manual page adjusted as well.


Modified: lunar/trunk/bin/lvu
===================================================================
--- lunar/trunk/bin/lvu	2005-05-27 13:08:03 UTC (rev 15104)
+++ lunar/trunk/bin/lvu	2005-05-27 13:50:48 UTC (rev 15105)
@@ -78,7 +78,10 @@
 urls        [module]       display all URLs for a module
 maintainer  module         display maintainer for a module
 version     module         display version of module in moonbase
+
+edit        module         copy a module to zlocal for editing
 submit      module         try to submit a module to the lunar ML
+unedit      module         delete your zlocal copy of a module
 
 sum         [module]       display checksums
 md5sum      [module]       display md5sums
@@ -727,6 +730,12 @@
 submit_module() {
   # this code tries to send the module back to the mailinglist
   # as good as it gets
+  if [ "$ZLOCAL_OVERRIDES" == "off" ]; then
+    message "You can't submit non-zlocal modules. Turn on ZLOCAL_OVERRIDES"
+	message "and do \`lvu edit \$MODULE; lin moonbase\`"
+	message "so that module changes can be tracked properly!"
+	exit 1
+  fi
   if [ -z "$1" ]; then
     message "submit requires a single module name."
     exit 1
@@ -740,9 +749,18 @@
       exit 1
   else
     if echo $SECTION | grep -q '^zlocal' ; then
-      SECTION=" "
+	  ZLOCAL_OVERRIDES=off SECTION=$(find_section $1)
+	  if echo $SECTION | grep -q '^zlocal' ; then
+	    unset SECTION
+	  fi
+	else
+	  message "Please don't edit modules outside of the 'zlocal' secion!"
+	  message "do this first: \`lvu edit \$MODULE ; lin moonbase\`"
+	  message "so that module changes can be tracked properly!"
+	  exit 1
     fi
     TMP_MSG=$(temp_create "submission")
+	BOUNDARY="===============$(date -u +%s)=="
     (
       echo '# MODULE SUBMISSION TEMPLATE'
       echo '# --------------------------'
@@ -755,12 +773,20 @@
       echo 'To: lunar at lunar-linux.org'
       echo 'Date:' $(date)
       echo 'Subject: Module submission -' $MODULE
+	  echo 'MIME-Version: 1.0'
+	  echo "Content-Type: multipart/mixed; boundary=\"$BOUNDARY\""
       echo '# '
       echo '# YOUR E_MAIL ADDRESS MUST BE VALID:'
       echo 'From: '
       echo '#Reply-To:'
       echo '#Cc: '
-      echo '# PLEASE DO NOT ADD WHITESPACE ABOVE THIS LINE'
+	  echo ''
+	  echo "--$BOUNDARY"
+	  echo 'Content-Type: text/plain; charset="us-ascii"'
+	  echo 'MIME-Version: 1.0'
+	  echo 'Content-Transfer-Encoding: 7bit'
+	  echo ''
+      echo '# PLEASE DO NOT CHANGE WHITESPACE ABOVE THIS LINE'
       echo ''
       echo '# '
       echo '# Please fill in some of the following information if applicable:'
@@ -777,17 +803,27 @@
       echo '# '
       echo ''
       echo '# YOUR NAME HERE'
-      echo ''
+	  echo "$USER"
+	  echo ''
       echo '# '
       echo '# Below is your module. Please do not change the format'
       echo '# '
-      cd $SCRIPT_DIRECTORY
-      for FILE in $(find . -type f | grep -v 'CVS/' | sed 's/\.\///g'); do
-        echo "==================== BEGIN $FILE ===================="
-        cat $FILE
-        echo "===================== END $FILE ====================="
-        echo ""
-      done
+	  echo ''
+	  echo "--$BOUNDARY"
+	  echo "Content-Type: text/plain; name=\"$1.patch\""
+	  echo 'MIME-Version: 1.0'
+	  echo ''
+	  if [ -n "$SECTION" ]; then
+	    diff -Nurb $MOONBASE/$SECTION/$MODULE $MOONBASE/zlocal/$MODULE --exclude ".svn" --exclude "CVS" | sed "s|^\([+-][+-][+-] \)$MOONBASE/[^/]*/|\1|g" | grep -v "^diff "
+	  else
+        cd $SCRIPT_DIRECTORY
+        for FILE in $(find . -type f | grep -v -e 'CVS/' -e '\.svn/' | sed 's/\.\///g'); do
+		  echo "--- $MODULE/$FILE"
+		  echo "+++ $MODULE/$FILE"
+		  echo "@@ -0,0 +1,$(wc -l $MODULE/$FILE| echo) @@"
+          cat $FILE | sed 's|^|+|g'
+        done
+	  fi
     ) > $TMP_MSG
     edit_file $TMP_MSG
     cat $TMP_MSG | grep -v '^#'
@@ -801,6 +837,46 @@
   fi
 }
 
+
+edit_module()
+{
+	if [ "ZLOCAL_OVERRIDES" == "off" ]; then
+		message "Cannot edit modules when ZLOCAL_OVERRIDES == off"
+		message "Do this: \`lunar set ZLOCAL_OVERRIDES on\`"
+	else
+		if SECTION=$(find_section $1) ; then
+			if echo $SECTION | grep -q ^zlocal; then
+				message "Module \"$1\" is already in section \"zlocal\""
+				message "unedit it first or edit the working copy"
+			else
+				cp -a $MOONBASE/$SECTION/$1 $MOONBASE/zlocal/
+				# clean out SCM directories
+				find $MOONBASE/zlocal/$1 -type d -name CVS -o -name .svn | xargs rm -rf
+				message "Copied \"$1\" from \"$SECTION\""
+				message "Edit your module in \"$MOONBASE/zlocal/$1\""
+			fi
+		else
+			message "Can't find module \"$1\""
+		fi
+	fi
+}
+
+
+unedit_module()
+{
+	if SECTION=$(find_section $1) ; then
+		if echo $SECTION | grep -q ^zlocal; then
+			rm -f $MOONBASE/$SECTION/$1
+			message "Removed \"$1\" from \"$SECTION\""
+		else
+			message "Module \"$1\" is not in section \"zlocal\""
+		fi
+	else
+		message "Can't find module \"$1\""
+	fi
+}
+
+
 main()  {
   case $1 in
     html)
@@ -1172,6 +1248,14 @@
      submit_module $2
      ;;
 
+   edit)
+     edit_module $2
+	 ;;
+
+   unedit)
+     unedit_module $2
+	 ;;
+
    *)
      help
      ;;

Modified: lunar/trunk/usr/share/man/man1/lvu.1
===================================================================
--- lunar/trunk/usr/share/man/man1/lvu.1	2005-05-27 13:08:03 UTC (rev 15104)
+++ lunar/trunk/usr/share/man/man1/lvu.1	2005-05-27 13:50:48 UTC (rev 15105)
@@ -54,6 +54,8 @@
 size [module]
 .PP
 .B lvu
+submit|edit|unedit [module]
+.B lvu
 $MODULE_SCRIPT <module>
 .SH "COPYRIGHT"
 .if n lvu(1) is Copyright (C) 2002-2003 Terry Chan with portions copyrighted by previous authors 2001\-2002
@@ -245,6 +247,21 @@
 .IP 
 displays a tree of the module's reverse dependencies.
 .PP 
+.B edit
+<module>
+.IP
+Copy an existing module to zlocal so it can be edited. Turn on ZLOCAL_OVERRIDES to make sure your edited module gets used instead of the default module.
+.PP
+.B unedit
+<module>
+.IP
+Discards your 'edit'ed zlocal module. Works the same as removing it.
+.PP
+.B submit
+<module>
+.IP
+Submit a module to the lunar module submission list/mail alias. Please only submit tested changes.
+.PP
 .B $MODULE_SCRIPT
 module
 .IP 



More information about the Lunar-commits mailing list