Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle float timestamp in RPM repository XML file #21

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Handle float timestamp in RPM repository XML file #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb64f5b
Handle float timestamp.
jonathan-mfi Nov 24, 2023
cbd4018
Use float instead of `Timestamp`
jonathan-mfi Jul 3, 2024
e42ae09
Comment test that use missing online file.
jonathan-mfi Jul 3, 2024
2d89948
Merge branch 'main' into rpm_repository/handle_float_timestamp
jnth Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion linux-package-analyzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ version = "0.18.0"
path = "../debian-packaging"

[dependencies.rpm-repository]
version = "0.3.0"
version = "0.3.1"
path = "../rpm-repository"

# rpm-rs seems to be unmaintained and its old dependencies are holding us back.
Expand Down
4 changes: 4 additions & 0 deletions rpm-repository/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

Released on ReleaseDate.

## 0.3.1 (not released)

* Handle float timestamp in `repomd.xml` (but saved rounded `u64` value).

## 0.3.0

Released on 2024-11-02.
Expand Down
2 changes: 1 addition & 1 deletion rpm-repository/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rpm-repository"
version = "0.3.0"
version = "0.3.1"
edition = "2021"
rust-version = "1.75"
authors = ["Gregory Szorc <[email protected]>"]
Expand Down
14 changes: 12 additions & 2 deletions rpm-repository/src/metadata/repomd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub struct RepoMdData {
/// Size in bytes of the file as stored in the repository.
pub size: Option<u64>,
/// Time file was created/modified.
pub timestamp: Option<u64>,
pub timestamp: Option<f64>,
/// Content checksum of the decoded (often decompressed) file.
#[serde(rename = "open-checksum")]
pub open_checksum: Option<Checksum>,
Expand Down Expand Up @@ -98,10 +98,20 @@ mod test {
use super::*;

const FEDORA_35_REPOMD_XML: &str = include_str!("../testdata/fedora-35-repodata.xml");
const WITH_FLOAT_TIMESTAMP: &str = include_str!("../testdata/with-float-timestamp.xml");

#[test]
fn fedora_35_parse() -> Result<()> {
RepoMd::from_xml(FEDORA_35_REPOMD_XML)?;
let result = RepoMd::from_xml(FEDORA_35_REPOMD_XML)?;
assert_eq!(result.data[0].timestamp, Some(1635225121.));

Ok(())
}

#[test]
fn with_float_timestamp_parse() -> Result<()> {
let result = RepoMd::from_xml(WITH_FLOAT_TIMESTAMP)?;
assert_eq!(result.data[0].timestamp, Some(1635225121.75));

Ok(())
}
Expand Down
107 changes: 107 additions & 0 deletions rpm-repository/src/testdata/with-float-timestamp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
<revision>1635225124</revision>
<data type="primary">
<checksum type="sha256">2311f37b3cdc06f72a535cb394e155c41e683edbeb4adfadc37bbfa090736d20</checksum>
<open-checksum type="sha256">2cc3c948f5b5542ea6472d187d53df13a9598a4ca7323850758cd8ed87bc7767</open-checksum>
<location href="repodata/2311f37b3cdc06f72a535cb394e155c41e683edbeb4adfadc37bbfa090736d20-primary.xml.gz"/>
<timestamp>1635225121.75</timestamp>
<size>529838</size>
<open-size>4430568</open-size>
</data>
<data type="filelists">
<checksum type="sha256">1c27df5e0ce2b7d8f4d20301dd0c52774e34ca0b3935b0232c799c0012d92dea</checksum>
<open-checksum type="sha256">f158c554baf9ad0c4a9119f1342a151e6f1d9e995065ef347c19941ec1f5b1ed</open-checksum>
<location href="repodata/1c27df5e0ce2b7d8f4d20301dd0c52774e34ca0b3935b0232c799c0012d92dea-filelists.xml.gz"/>
<timestamp>1635225121</timestamp>
<size>1278036</size>
<open-size>14044647</open-size>
</data>
<data type="other">
<checksum type="sha256">ccf942ff083cfd01aeac3811774aa7060c9eed55a4796547c1e0f127204a2cb6</checksum>
<open-checksum type="sha256">7beed2d2bd07cbd8b2b3344a7738ab442a6fc154c2c1941ae32bab0b6d057883</open-checksum>
<location href="repodata/ccf942ff083cfd01aeac3811774aa7060c9eed55a4796547c1e0f127204a2cb6-other.xml.gz"/>
<timestamp>1635225121</timestamp>
<size>504983</size>
<open-size>4911790</open-size>
</data>
<data type="primary_db">
<checksum type="sha256">39d24ea1e128cb95071b36586363230c682584d4ac410330920b9dc2cc291487</checksum>
<open-checksum type="sha256">61d268ba791b40580cbcd1739cd6be75f188ce797abcc085c3e010658d5adab0</open-checksum>
<location href="repodata/39d24ea1e128cb95071b36586363230c682584d4ac410330920b9dc2cc291487-primary.sqlite.xz"/>
<timestamp>1635225122</timestamp>
<size>791392</size>
<open-size>4296704</open-size>
<database_version>10</database_version>
</data>
<data type="filelists_db">
<checksum type="sha256">6b14ebdbfd00c0765de56f0724fcb5aea9273284382e99442cf2fd3586f0a6e9</checksum>
<open-checksum type="sha256">830fbfc293695e9edebe7b2055d5ca209b076b45e69b45de750316a57bb9ab80</open-checksum>
<location href="repodata/6b14ebdbfd00c0765de56f0724fcb5aea9273284382e99442cf2fd3586f0a6e9-filelists.sqlite.xz"/>
<timestamp>1635225123</timestamp>
<size>1216724</size>
<open-size>7237632</open-size>
<database_version>10</database_version>
</data>
<data type="other_db">
<checksum type="sha256">9e236d3288e09791773e41bd2dfa5933976cca7a95305570bfd975dc5bcc1d3d</checksum>
<open-checksum type="sha256">bec8e6cf16eec2328b98d8514ae348a395db847ce9a2e164c683cf91911fa5e3</open-checksum>
<location href="repodata/9e236d3288e09791773e41bd2dfa5933976cca7a95305570bfd975dc5bcc1d3d-other.sqlite.xz"/>
<timestamp>1635225122</timestamp>
<size>379168</size>
<open-size>4505600</open-size>
<database_version>10</database_version>
</data>
<data type="primary_zck">
<checksum type="sha256">52749b7d111c47548c5a68c5d6daf2449415b1b55be94f9e84fb0f97452a2e09</checksum>
<open-checksum type="sha256">2cc3c948f5b5542ea6472d187d53df13a9598a4ca7323850758cd8ed87bc7767</open-checksum>
<header-checksum type="sha256">4ea6c649505d487a853c08c76809fd7628cb2b841c97bf9dcad36c9c84635da9</header-checksum>
<location href="repodata/52749b7d111c47548c5a68c5d6daf2449415b1b55be94f9e84fb0f97452a2e09-primary.xml.zck"/>
<timestamp>1635225121</timestamp>
<size>1059955</size>
<open-size>4430568</open-size>
<header-size>20571</header-size>
</data>
<data type="filelists_zck">
<checksum type="sha256">69259bbcbef93b2cc7ff36a1d1cfb80fd15c4e62564b7c3904636bd47cd8cfe1</checksum>
<open-checksum type="sha256">f158c554baf9ad0c4a9119f1342a151e6f1d9e995065ef347c19941ec1f5b1ed</open-checksum>
<header-checksum type="sha256">f7ba84d8d4149caf5e355f44388022cce45f5a25f623d6ef31cebc3be4350b41</header-checksum>
<location href="repodata/69259bbcbef93b2cc7ff36a1d1cfb80fd15c4e62564b7c3904636bd47cd8cfe1-filelists.xml.zck"/>
<timestamp>1635225121</timestamp>
<size>1350659</size>
<open-size>14044647</open-size>
<header-size>20640</header-size>
</data>
<data type="other_zck">
<checksum type="sha256">f1ab54978eec08eaa17b9295ea3e4cb13966aa5346ad2f46aa1b75c1af1be92e</checksum>
<open-checksum type="sha256">7beed2d2bd07cbd8b2b3344a7738ab442a6fc154c2c1941ae32bab0b6d057883</open-checksum>
<header-checksum type="sha256">8329ea8316f1590970c89aa0fcfb70d668cb67fde413b8e82dfc6f8b3914d06f</header-checksum>
<location href="repodata/f1ab54978eec08eaa17b9295ea3e4cb13966aa5346ad2f46aa1b75c1af1be92e-other.xml.zck"/>
<timestamp>1635225121</timestamp>
<size>708993</size>
<open-size>4911790</open-size>
<header-size>20564</header-size>
</data>
<data type="group">
<checksum type="sha256">4fcfe2d7ab9cf7375051a27642d473314cb2b8f2d3d98cd09b9561428203a9e3</checksum>
<location href="repodata/4fcfe2d7ab9cf7375051a27642d473314cb2b8f2d3d98cd09b9561428203a9e3-comps-Server.x86_64.xml"/>
<timestamp>1635225090</timestamp>
<size>106236</size>
</data>
<data type="group_xz">
<checksum type="sha256">20c70a35954eef42f88e532ba9cda00b65eb78fea9bd2e2e9681ea5e47016276</checksum>
<location href="repodata/20c70a35954eef42f88e532ba9cda00b65eb78fea9bd2e2e9681ea5e47016276-comps-Server.x86_64.xml.xz"/>
<timestamp>1635225121</timestamp>
<size>23368</size>
</data>
<data type="group_zck">
<checksum type="sha256">85221f4de87a3a3e1dffd01990821992fffe7059101fdfeca45b78bc2abcb0e3</checksum>
<open-checksum type="sha256">20c70a35954eef42f88e532ba9cda00b65eb78fea9bd2e2e9681ea5e47016276</open-checksum>
<header-checksum type="sha256">63adce3e9909362a0d33edf8985786c7a700817352da6c30a22d6a215078d088</header-checksum>
<location href="repodata/85221f4de87a3a3e1dffd01990821992fffe7059101fdfeca45b78bc2abcb0e3-comps-Server.x86_64.xml.zck"/>
<timestamp>1635225124</timestamp>
<size>29665</size>
<open-size>23368</open-size>
<header-size>158</header-size>
</data>
</repomd>