-
-
Save anonymous/c5cc0afa87ae91b3299365b9f1f0a72d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/get-version b/get-version | |
index 6bfdcb1ad..cecd35e3b 100755 | |
--- a/get-version | |
+++ b/get-version | |
@@ -24,7 +24,7 @@ if [ -f .dist-version ]; then | |
elif [ -d .git ]; then | |
# Get the version from the git repository. Since tags cannot contain colons | |
# or tildes, we use percent and underscore instead. Reverse that switch here. | |
- version=$(git describe --abbrev=4 HEAD 2>/dev/null | tr %_ :~) | |
+ version=$(git describe --abbrev=4 --always HEAD 2>/dev/null | tr %_ :~) | |
# Check if we are on a dirty checkout. | |
git update-index --refresh -q >/dev/null | |
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c | |
index 57bd2a66b..ac5bd510b 100644 | |
--- a/lib/dpkg/triglib.c | |
+++ b/lib/dpkg/triglib.c | |
@@ -784,8 +784,8 @@ trig_incorporate(enum modstatdb_rw cstatus) | |
ohshite(_("unable to create triggers state" | |
" directory '%.250s'"), triggersdir); | |
} else if (chown(triggersdir, 0, 0)) { | |
- ohshite(_("unable to set ownership of triggers state" | |
- " directory '%.250s'"), triggersdir); | |
+ /*ohshite(_("unable to set ownership of triggers state" | |
+ " directory '%.250s'"), triggersdir);*/ | |
} | |
ur = trigdef_update_start(tduf); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment