Date: Sat, 8 Sep 2001 00:45:52 +0300 (EEST) From: Giorgos Keramidas <charon@labs.gr> To: FreeBSD-gnats-submit@freebsd.org Subject: misc/30423: CVSROOT/modules has mistakenly single-line comments in some module-aliases Message-ID: <200109072145.f87Ljqe13039@hades.hell.gr>
next in thread | raw e-mail | index | archive | help
>Number: 30423 >Category: misc >Synopsis: CVSROOT/modules has mistakenly single-line comments in some module-aliases >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 07 15:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Giorgos Keramidas >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD hades.hell.gr 5.0-CURRENT FreeBSD 5.0-CURRENT #5: Tue Sep 4 19:49:44 EEST 2001 root@hades.hell.gr:/usr/obj/usr/src/sys/CHARON i386 >Description: When using 'cvs co -c' on /home/ncvs (my local CVS mirror), I saw that a few lines were not actual module aliases, but plain empty lines, starting with whitespace and '#' characters. Looking at CVSROOT/modules, I found lines like: -------------------------------------------------------------- bsd_apropos src/usr.bin/apropos #deleted files -------------------------------------------------------------- The info page of CVS includes a detailed description of 'module options' that can go after the module name in a line, but does not mention 'single line comments'. It only mentions 'comment lines' in the following context (in the section: Top -> Administrative files -> modules). The `modules' file may contain blank lines and comments (lines beginning with `#') as well as module definitions. >How-To-Repeat: The lines that include 'single line comments' in CVSROOT/modules cause 'cvs co -c' to list fake module entries like the ones shown below: % cvs -R -d /home/ncvs co -c | grep '^[^a-zA-Z0-9]' #deleted files ... This is obviously not a real module in the repository. And it is not a comment line either. >Fix: The attached patch removes the comments from those lines of CVSROOT/modules that contain such comment-like parts. Of course, instead of removing these lines altogether, one might prefer to move them `above' the relevant module lines. --- patch.diff begins here --- Index: modules =================================================================== RCS file: /home/ncvs/CVSROOT/modules,v retrieving revision 1.3817 diff -u -u -r1.3817 modules --- modules 6 Sep 2001 22:39:22 -0000 1.3817 +++ modules 7 Sep 2001 21:35:43 -0000 @@ -534,15 +534,15 @@ brouted ports/net/brouted brs ports/misc/brs bs src/games/bs -bsd_apropos src/usr.bin/apropos #deleted files -bsd_diff src/usr.bin/diff #just man pages -bsd_grep src/usr.bin/grep #appears to be just egrep? -bsd_ld src/usr.bin/ld #deleted files -bsd_man src/usr.bin/man #deleted files -bsd_patch src/usr.bin/patch #deleted obsolete files -bsd_sort src/usr.bin/sort #just man pages +bsd_apropos src/usr.bin/apropos +bsd_diff src/usr.bin/diff +bsd_grep src/usr.bin/grep +bsd_ld src/usr.bin/ld +bsd_man src/usr.bin/man +bsd_patch src/usr.bin/patch +bsd_sort src/usr.bin/sort bsd_uucp src/usr.bin/uucp -bsd_whatis src/usr.bin/whatis #deleted files +bsd_whatis src/usr.bin/whatis bsdi-netscape47-communicator ports/www/bsdi-netscape47-communicator bsdi-netscape47-navigator ports/www/bsdi-netscape47-navigator bsmtp ports/mail/bsmtp @@ -1924,7 +1924,7 @@ gzip src/gnu/usr.bin/gzip h2n ports/net/h2n ha ports/archivers/ha -hack src/games/hack #should be replaced by nethack! +hack src/games/hack hagelslag ports/net/hagelslag halflifeserver ports/games/halflifeserver handbook doc/en_US.ISO8859-1/books/handbook --- patch.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109072145.f87Ljqe13039>