Merge branch 'merge'

[dak.git] / config / debian / dinstall.functions

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 1ced76028b703c107b19ed6a4028705ef3ca598a..80af138d2a2ba624aa1dd1c6e37d7259bf55183c 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -11,7 +11,7 @@ function remove_daily_lock() {
 
 # Remove all locks
 function remove_all_locks() {
-    rm -f $LOCK_DAILY $LOCK_ACCEPTED $LOCK_NEW
+    rm -f $LOCK_DAILY $LOCK_ACCEPTED
 }
 
 # If we error out this one is called, *FOLLOWED* by cleanup above
@@ -615,7 +615,7 @@ EOF
 # extract changelogs and stuff
 function changelogs() {
     log "Extracting changelogs"
-    dak make-changelog -e -a ftp-master
+    #dak make-changelog -e -a ftp-master
     mkdir -p ${exportpublic}/changelogs
     cd ${exportpublic}/changelogs
     rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .