[Git][ftp-team/dak][deploy] 3 commits: Don't let ls warn on maintenance time. The true reason is long gone anyways.

[Joerg Jaspert <joerg@debian.org>]

Title: GitLab

Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak

Commits:

• e05703d4
  by Joerg Jaspert at 2018-04-16T22:58:03+02:00

  Don't let ls warn on maintenance time. The true reason is long gone anyways.
  

• e63b66f5
  by Joerg Jaspert at 2018-04-16T23:03:08+02:00

  Stop relying on daily.lock
  
  That was to keep humans out. Automated runs are locked by the
  cronscript against running twice, AND dinstall.lock is taken by p-u
  just a line later for its own stuff.
  

• de320042
  by Joerg Jaspert at 2018-04-16T23:04:18+02:00

  Merge branch 'master' into deploy
  
  * master:
    Stop relying on daily.lock
    Don't let ls warn on maintenance time. The true reason is long gone anyways.
  

2 changed files:

• dak/ls.py
• dak/process_upload.py

Changes:

dak/ls.py

---

...	...	@@ -91,10 +91,6 @@ def main ():
91	91	if not packages:
92	92	utils.fubar("need at least one package name as an argument.")
93	93
94		- # If cron.daily is running; warn the user that our output might seem strange
95		- if os.path.exists(os.path.join(cnf["Dir::Lock"], "daily.lock")):
96		- utils.warn("Archive maintenance is in progress; database inconsistencies are possible.")
97		-
98	94	# Handle buildd maintenance helper options
99	95	if Options["GreaterOrEqual"] or Options["GreaterThan"]:
100	96	if Options["GreaterOrEqual"] and Options["GreaterThan"]:

dak/process_upload.py

---

...	...	@@ -543,10 +543,6 @@ def main():
543	543	if Options["No-Action"]:
544	544	Options["Automatic"] = ""
545	545
546		- # Check that we aren't going to clash with the daily cron job
547		- if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (cnf["Dir::Lock"])) and not Options["No-Lock"]:
548		- utils.fubar("Archive maintenance in progress. Try again later.")
549		-
550	546	# Obtain lock if not in no-action mode and initialize the log
551	547	if not Options["No-Action"]:
552	548	lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.