Просмотр исходного кода

Merge michael.vogt@ubuntu.com--2005/apt--mvo--0
Patches applied:

* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-20
* supress output when /var/cache/apt/archives is empty; break when min-age is reached

* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-21
* changed distro to "experimental", changed version number to 0.6.36

Matt Zimmerman лет назад: 21
Родитель
Сommit
61abe43c0b
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      debian/apt.cron.daily
  2. 1 1
      debian/changelog

+ 2 - 2
debian/apt.cron.daily

@@ -110,7 +110,7 @@ check_size_constraints()
 	MinAge=$(($MinAge*24*60*60))
 	MinAge=$(($MinAge*24*60*60))
 
 
 	# reverse-sort by mtime
 	# reverse-sort by mtime
-	for file in $(ls -rt $Cache/*.deb); do 
+	for file in $(ls -rt $Cache/*.deb 2>/dev/null); do 
 	    du=$(du -s $Cache)
 	    du=$(du -s $Cache)
 	    size=${du%%/*}
 	    size=${du%%/*}
 	    # check if the cache is small enough
 	    # check if the cache is small enough
@@ -125,7 +125,7 @@ check_size_constraints()
 		#echo "$file ($delta), $MinAge"
 		#echo "$file ($delta), $MinAge"
 		if [ $delta -le $MinAge ]; then
 		if [ $delta -le $MinAge ]; then
 		    #echo "Skiping $file (delta=$delta)"
 		    #echo "Skiping $file (delta=$delta)"
-		    continue
+		    break
 		fi
 		fi
 	    fi
 	    fi
 
 

+ 1 - 1
debian/changelog

@@ -1,4 +1,4 @@
-apt (0.6.36) unstable; urgency=low
+apt (0.6.36) experimental; urgency=low
 
 
   * Merge apt--mvo--0:
   * Merge apt--mvo--0:
     - apt-pkg/acquire-item.cc:
     - apt-pkg/acquire-item.cc: