Bug#601945: devscripts: [uupdate] don't ignore starts with . files

[Hideki Yamane]

Package: devscripts
Version: 2.10.69
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi,

 uupdate ignores files that name start with "." 


 Step to reproduce)

> host:~/src/eclipse/pleiades-1.3.1-dfsg$ uupdate -u ../pleiades_1.3.2-src.zip 
> -v 1.3.2
> New Release will be 1.3.2-1.
> -- Untarring the new sourcecode archive ../pleiades_1.3.2-src.zip
> Archive:  ../pleiades_1.3.2-src.zip
>    creating: .settings/
>    creating: META-INF/
>    creating: about/
>    creating: about/features/
>    creating: about/plugins/
>    creating: bin/
(snip)
>   inflating: .classpath              
>   inflating: .keystore               
>   inflating: .keystore.cmd           
>   inflating: .project                
>   inflating: .settings/org.eclipse.core.resources.prefs  
>   inflating: .settings/org.eclipse.jdt.core.prefs  
>   inflating: .settings/org.eclipse.jdt.ui.prefs  
>   inflating: META-INF/MANIFEST.MF    
(snip)
> Unpacking the debian/ directory from version 1.3.1-dfsg-2 worked fine.
> Remember: Your current directory is the OLD sourcearchive!
> Do a "cd ../pleiades-1.3.2" to see the new package
 
  There are some files named ".*" - .settings, .classpath, etc.
  However,
 
> host:~/src/eclipse/pleiades-1.3.1-dfsg$ cd ../pleiades-1.3.2
> host:~/src/eclipse/pleiades-1.3.2$ ls -al
> 合計 104
> drwxr-xr-x 12 henrich henrich  4096 2010-10-31 17:39 .
> drwxr-xr-x 12 henrich henrich 12288 2010-10-31 17:39 ..
> drwxr-xr-x  2 henrich henrich  4096 2010-10-27 20:49 META-INF
> drwxr-xr-x  4 henrich henrich  4096 2010-09-15 21:23 about
> drwxr-xr-x  3 henrich henrich  4096 2010-09-15 21:24 bin
> drwxr-xr-x  2 henrich henrich  4096 2010-09-15 21:24 bintest
> -rw-r--r--  1 henrich henrich 16738 2010-09-25 17:21 build.xml
> drwxr-xr-x  4 henrich henrich  4096 2010-09-15 21:23 conf
> drwxr-xr-x  4 henrich henrich  4096 2010-10-31 17:39 debian
> -rw-r--r--  1 henrich henrich   285 2009-03-13 03:40 eclipse.exe -clean.cmd
> -rw-r--r--  1 henrich henrich   994 2008-12-20 01:26 eclipse.exe startup.cmd
> -rw-r--r--  1 henrich henrich 16536 2005-08-11 15:51 epl-v10.html
> drwxr-xr-x  4 henrich henrich  4096 2010-09-15 21:23 lib
> drwxr-xr-x  2 henrich henrich  4096 2010-10-27 20:30 readme
> drwxr-xr-x  3 henrich henrich  4096 2010-09-15 21:23 src
> drwxr-xr-x  3 henrich henrich  4096 2010-09-15 21:23 srctest
 
 There is NO .files there.
 When uupdate moves files by using mv, it ignores .* files

> ls $TEMP_DIR | wc -l
> ++ ls uupdate.Q7YPXDta
> ++ wc -l
> + '[' 13 -eq 1 ']'
> + mkdir pleiades-1.3.2
> + mv uupdate.Q7YPXDta/META-INF uupdate.Q7YPXDta/about uupdate.Q7YPXDta/bin 
> uupdate.Q7YPXDta/bintest uupdate.Q7YPXDta/build.xml uupdate.Q7YPXDta/conf 
> 'uupdate.Q7YPXDta/eclipse.exe -clean.cmd' 'uupdate.Q7YPXDta/eclipse.exe 
> startup.cmd' uupdate.Q7YPXDta/epl-v10.html uupdate.Q7YPXDta/lib 
> uupdate.Q7YPXDta/readme uupdate.Q7YPXDta/src uupdate.Q7YPXDta/srctest 
> pleiades-1.3.2
> 
 
 So, I'll send a quick fix for you. Please check it, thanks.


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAEBCgAGBQJMzTlRAAoJEF0yjQgqqrFAVcAQAK/1s+ikLCHypTdCZQhMn6AO
KLx1nshEUIvroUmD744fl5iAXkFii9Uyu5+JApflfd1XdJSO2hSrDgP5OQtjUB9f
fc6ODKVjmQydq6JQGb8NxJZtPDGaaWU6SUhI6b6Boxlf9TfkYrpDJnfiACk3Nyul
iWcQ4GDBrf34zhOdXsoRCsJUpZvJM15hOCLHpf+FJoPGR78mNb9tpzpk9n9++aIW
ZMd2tFZYQDJ8sPAtQ+88ZmYjGsp7MhVtH3iO4C8FKmOF9AqRE/rTtlxZnj/yssCG
i56uQArZZuak19tDW+Yo82sk/NhulubmFvLyN9FSCRbtIGt0Ef1Kh75tXuCbti+L
WUE/ns1oeTX0/CV/fsiV88+s79xGO47+zJsUfeJwgsE8KW5n/Q4k/7c+Tmwzn51U
saIzz6jF8+tleRQmyu0+PVXCM4nyuvrwrJfMMrtBMNdq63Legn4CpIUKJOOkRiDk
h4RCg3WAV50ypWc005b7ibEGGn8NFpX89eisEVezTC+r6dUgMuiSiTAPqqBNR6Wn
sPRCImmSqlAiV7hGn8dufJ5J2ufaO3mYUo8hvMEen8Z2UhLBrnSOXbHxsdUnzvfw
SlDLgM2V4+vXPEBtIWUcBeR3hfqeO1UM17ypBCR/bh6TlwxBvZayX212CbU6Zy9i
8rVy9wjpcdGtgdSyYxST
=gpLU
-----END PGP SIGNATURE-----

--- scripts/uupdate.sh.orig     2010-10-21 20:37:03.000000000 +0900
+++ scripts/uupdate.sh  2010-10-31 18:27:20.320000000 +0900
@@ -681,10 +681,12 @@
     if [ `ls $TEMP_DIR | wc -l` -eq 1 ]; then
        # The files are stored in the archive under a top directory, we presume
        mv $TEMP_DIR/* $PACKAGE-$SNEW_VERSION
+       mv $TEMP_DIR/.[0-9a-zA-Z]* $PACKAGE-$SNEW_VERSION
     else
        # Otherwise, we put them into a new directory
        mkdir $PACKAGE-$SNEW_VERSION
        mv $TEMP_DIR/* $PACKAGE-$SNEW_VERSION
+       mv $TEMP_DIR/.[0-9a-zA-Z]* $PACKAGE-$SNEW_VERSION
     fi
     rm -rf $TEMP_DIR
     cp -a $PACKAGE-$SNEW_VERSION $PACKAGE-$SNEW_VERSION.orig