[med-svn] [Git][med-team/community/helper-scripts][master] 2 commits: Fix cut-n-pasto

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / community / helper-scripts


Commits:
a1751469 by Andreas Tille at 2019-05-10T12:36:14Z
Fix cut-n-pasto

- - - - -
77c6c30e by Andreas Tille at 2019-07-02T13:39:28Z
Strip NMU release numbers

- - - - -


2 changed files:

- do_backport
- seek_outdated_med-packages


Changes:

=====================================
do_backport
=====================================
@@ -59,8 +59,8 @@ if [ -n "$exists" ] ; then
     # debug: check whether all is OK, if the above works several times remove next line
     # edit debian/changelog
     if grep -q -e '^<<<<<<<' -e '^=======' debian/control ; then
-      echo "There are merge issues in debian/changelog"
-      edit debian/changelog
+      echo "There are merge issues in debian/control"
+      edit debian/control
     fi
     git commit || true
   fi


=====================================
seek_outdated_med-packages
=====================================
@@ -17,7 +17,7 @@ SELECT source  AS "source                       ", version, upstream_version,
        array_to_string(array_sort(uploaders),',') AS "uploaders                      ",
         changed_by_name AS "Last uploader       ", date AS "Last uploaded" FROM (
   SELECT distinct u.source,
-         regexp_replace(regexp_replace(regexp_replace(u.version, '^[0-9]:', ''), '-[0-9]+$', ''), '\+dfsg[0-9]*', '') AS version,
+         regexp_replace(regexp_replace(regexp_replace(u.version, '^[0-9]:', ''), '-[.0-9]+$', ''), '\+dfsg[0-9]*', '') AS version,
          upstream_version, status, up.uploaders, uh.changed_by_name, uh.date
     FROM upstream u 
     JOIN (SELECT source, package, release, maintainer_email, regexp_replace(version, '\+b[0-9]+$', '') AS version FROM packages)  p ON p.source=u.source -- make sure binNMU version will be stripped



View it on GitLab: https://salsa.debian.org/med-team/community/helper-scripts/compare/add3c67c8592cf616b8c5e87ce040bac050e8228...77c6c30e4c3739e09899a58531b93cfc3364d7a5

-- 
View it on GitLab: https://salsa.debian.org/med-team/community/helper-scripts/compare/add3c67c8592cf616b8c5e87ce040bac050e8228...77c6c30e4c3739e09899a58531b93cfc3364d7a5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190702/a64cd50d/attachment.html>